From 5c492eaa5541853db18887df1b774ffb7f4a76a5 Mon Sep 17 00:00:00 2001
From: David Straub <straub@protonmail.com>
Date: Fri, 30 Jan 2026 20:45:41 +0100
Subject: [PATCH 1/2] Update CRunDec to v3.1.1

---
 CRunDec3/CRunDec.3.0.cpp                  | 3086 ----------------
 CRunDec3/CRunDec.3.0.h                    | 1017 ------
 CRunDec3/{CRunDec.3.1.cpp => CRunDec.cpp} |  188 +-
 CRunDec3/{CRunDec.3.1.h => CRunDec.h}     |  119 +-
 README.md                                 |   19 +-
 _rundec.cc                                | 3974 +++++++++++++--------
 rundec.i                                  |   63 +-
 rundec.py                                 |   64 +-
 setup.py                                  |    3 +-
 test/test_massMS.py                       |   32 +-
 10 files changed, 2718 insertions(+), 5847 deletions(-)
 delete mode 100644 CRunDec3/CRunDec.3.0.cpp
 delete mode 100644 CRunDec3/CRunDec.3.0.h
 rename CRunDec3/{CRunDec.3.1.cpp => CRunDec.cpp} (97%)
 rename CRunDec3/{CRunDec.3.1.h => CRunDec.h} (92%)

diff --git a/CRunDec3/CRunDec.3.0.cpp b/CRunDec3/CRunDec.3.0.cpp
deleted file mode 100644
index 9113734..0000000
--- a/CRunDec3/CRunDec.3.0.cpp
+++ /dev/null
@@ -1,3086 +0,0 @@
-/*
-  CRunDec.cpp, v3.0
-
-  Authors: Florian Herren and Matthias Steinhauser (Feb 2017)
-
-  F. Herren, M. Steinhauser,
-  "Version 3 of RunDec and CRunDec"
-  arXiv:1703.03751, TTP17-011
-
-  Changes since v2.1:
-  Dec 2016: added five-loop beta function (see arXiv:1606.08659);
-            extended LamExpl, LamImpl, AlphasLam to five loops;
-            ported DecAsDownMS, DecMqDownMS and DecMq{Up,Down}SI from RunDec;
-            extended Dec{As,Mq}{Up,Down}{MS,SI} to four loops;
-  Jan 2017: fixed Segmentation fault in case null pointer is passed as "mq" in
-            mass conversion routines, minor bugfixes in threshold mass routines
-            added DecLambdaUp/Down to 5 loops
-            extended mRGI2mMS/mMS2mRGI/mMS2mRGImod to 5 loops
-            included light quark mass effects in MS-OS relation up to three loops (arXiv:0708.1729)
-*/
-
-/*
-  CRunDec.cpp, v2.1
-
-  Authors: Florian Herren and Matthias Steinhauser (Jun 2016)
-
-  Changes since v2.0:
-  Jun 2016: improved 4-loop coefficients in mMS2mOS, mOS2mSI, mOS2mMS
-*/
-
-/*
-  Based on:
-
-  CRunDec.cpp, v2.0
-
-  Authors: Florian Herren and Matthias Steinhauser (Jan 2016)
-
-  Changes since v1.1:
-  Sep 2015: extended mOS2mMS, mMS2mOS to four loops (see arXiv:1502.01030);
-            mMS2mMS to five loops (see arXiv:1402.6611);
-            DecMqUp/DownOS to four loops (see hep-ph/0512058, hep-ph/0512060
-            and arXiv:1502.04719);
-            prepared AsmMSrunexact, AlphasExact for five loops
-  Oct 2015: implemented PS, 1S and RS masses, now requires C++11 for tgamma,
-            extended mOS2mSI to four loops (see arXiv:1502.01030)
-  Dec 2015: bugfix: nl -> nlq in fas6to5ms, ported DecAsDownSI/DecAsUpSI from RunDec
-  Jan 2016: Add RS' mass relations (see arXiv:1502.01030)
-*/
-
-/*
-  Based on:
-
-  CRunDec.cpp, v1.1
-
-  Author: Barbara Schmidt
-
-  For documentation see
-
-  CRunDec: a C++ package for running and decoupling of the
-  strong coupling and quark masses
-
-  by
-
-  Barbara Schmidt, Matthias Steinhauser
-
-  Comput.Phys.Commun. 183 (2012) 1845-1848
-  arXiv:1201.6149
-  SFB/CPP-12-03
-  TTP12-02
-
-  See also:
-  K.G. Chetyrkin, J.H. Kuhn and M. Steinhauser,
-  "RunDec: A Mathematica package for running and decoupling of the strong
-  coupling and quark masses"
-  Comput. Phys. Commun.  133 (2000) 43,
-  arXiv:hep-ph/0004189
-
-  May 2013: minor modifications to avoid "-Wunused-parameter"
-            during compilation with g++ -Wall -Wextra
-  Sep 2013: bug fix in fRungeKuttaImpl (thanks to Stephen Jones)
-  Oct 2014: bug fix in AsmMSrunexact
-*/
-
-/*
-License:
-
-CRunDec is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <iostream>
-#include <iomanip>
-#include <cmath>
-
-#include "CRunDec.h"
-
-// Some constants:
-#define cf 4./3.
-#define ca 3.
-#define tr 1./2.
-#define B4 -1.762800087073770864061897634679818807215137274389016762629478603776
-#define A4 0.5174790616738993863307581618988629456223774751413792582443193479770
-#define A5 0.5084005792422687074591088492585899413195411256648216487244977963526
-#define Pi 3.14159265358979323846
-#define Zeta2 (Pi*Pi)/6.
-#define Zeta3 1.20205690315959428539973816151144999076498629234049888179227155534
-#define Zeta4 (Pi*Pi*Pi*Pi)/90.
-#define Zeta5 1.03692775514336992633136548645703416805708091950191281197419267790
-#define Zeta6 (Pi*Pi*Pi*Pi*Pi*Pi)/945.
-#define Zeta7 1.00834927738192282683979754984979675959986356056523870641728313657160147831735573534609696891385132
-#define ln2 log(2)
-
-using namespace std;
-
-// Default constructor:
-CRunDec::CRunDec(){
-     for(int i=0; i<4; i++){
-       mq[i].first = 0.;
-       mq[i].second = 0.;
-       nfMmu[i].Mth=0.;
-       nfMmu[i].muth=0.;
-       nfMmu[i].nf=0;
-     }
-     AM.Asexact=0.;
-     AM.mMSexact=0.;
-}
-
-// Constructor called with number for active flavours nf
-CRunDec::CRunDec(int n){
-     this->SetConstants(n);
-     for(int i=0; i<4; i++) {
-       mq[i].first = 0.;
-       mq[i].second = 0.;
-       nfMmu[i].Mth=0.;
-       nfMmu[i].muth=0.;
-       nfMmu[i].nf=0;
-     }
-     AM.Asexact=0.;
-     AM.mMSexact=0.;
-}
-
-// Define constants (if not already done in constructor)
-void CRunDec::SetConstants(int n){
-     double nf=(double) n;
-     Nf=nf;
-     double nl = nf-1;
-     Beta[0]= (double)0.25*(11.0 - 2.*nf/3.0);
-     Beta[1]= (double)(102.0 - 38.*nf/3.0)/16.0;
-     Beta[2]= (double)(0.5*2857. - 5033.*nf/18.0 + 325.*nf*nf/54.0)/64.0;
-     Beta[3]= (double)(149753./6.0 + 3564.*Zeta3 +
-              (-1078361./162.0 - 6508.*Zeta3/27.0)*nf +
-              (50065./162.0 + 6472.*Zeta3/81.0)*nf*nf +
-              1093.*nf*nf*nf/729.0)/256.0;
-     Beta[4]= (double)(8157455.0/16.0 + 621885.0/2.0*Zeta3  - 88209.0/2.0*Zeta4 - 288090.0*Zeta5 +
-              (-336460813./1944. - 4811164./81.*Zeta3 + 33935./6.*Zeta4 + 1358995./27.*Zeta5)*nf +
-              (25960913./1944. + 698531./81.*Zeta3 - 10526./9.*Zeta4 - 381760./81.*Zeta5)*nf*nf +
-              (-630559./5832. - 48722./243.*Zeta3 + 1618./27.*Zeta4 + 460./9.*Zeta5)*nf*nf*nf +
-              (1205./2916. - 152./81.*Zeta3)*nf*nf*nf*nf)/1024.0;
-     Betap[0]= (double)0.25*(11.0 - 2.*nl/3.0);
-     Betap[1]= (double)(102.0 - 38.*nl/3.0)/16.0;
-     Betap[2]= (double)(0.5*2857. - 5033.*nl/18.0 + 325.*nl*nl/54.0)/64.0;
-     Betap[3]= (double)(149753./6.0 + 3564.*Zeta3 +
-              (-1078361./162.0 - 6508.*Zeta3/27.0)*nl +
-              (50065./162.0 + 6472.*Zeta3/81.0)*nl*nl +
-              1093.*nl*nl*nl/729.0)/256.0;
-     Betap[4]= (double)(8157455.0/16.0 + 621885.0/2.0*Zeta3  - 88209.0/2.0*Zeta4 - 288090.0*Zeta5 +
-              (-336460813./1944. - 4811164./81.*Zeta3 + 33935./6.*Zeta4 + 1358995./27.*Zeta5)*nl +
-              (25960913./1944. + 698531./81.*Zeta3 - 10526./9.*Zeta4 - 381760./81.*Zeta5)*nl*nl +
-              (-630559./5832. - 48722./243.*Zeta3 + 1618./27.*Zeta4 + 460./9.*Zeta5)*nl*nl*nl +
-              (1205./2916. - 152./81.*Zeta3)*nl*nl*nl*nl)/1024.0;
-
-     Gamma[0]=(double)1.0;
-     Gamma[1]=(double)(202./3.-20.*nf/9.)/16.;
-     Gamma[2]=(double)(1249. + (-2216./27. - 160.*Zeta3/3.)*nf-
-              140.*nf*nf/81.)/64.;
-     Gamma[3]=(double)(4603055./162. + 135680.*Zeta3/27. - 8800.*Zeta5 +
-              (-91723./27. - 34192.*Zeta3/9. +
-              880.*Zeta4 + 18400.*Zeta5/9.)*nf +
-              (5242./243. + 800.*Zeta3/9. - 160.*Zeta4/3.)*nf*nf +
-              (-332./243. + 64.*Zeta3/27.)*nf*nf*nf)/256.;
-     Gamma[4]=(double)(99512327./162. + 46402466.*Zeta3/243. + 96800.*Zeta3*Zeta3 - 698126.*Zeta4/9.
-              -231757160.*Zeta5/243. + 242000.*Zeta6 + 412720.*Zeta7
-              +nf*(-150736283./1458. - 12538016.*Zeta3/81. - 75680.*Zeta3*Zeta3/9. + 2038742.*Zeta4/27.
-              + 49876180.*Zeta5/243. - 638000.*Zeta6/9. - 1820000.*Zeta7/27.)
-              +nf*nf*(1320742./729. + 2010824.*Zeta3/243. + 46400.*Zeta3*Zeta3/27. - 166300.*Zeta4/27. - 264040.*Zeta5/81. + 92000.*Zeta6/27.)
-              +nf*nf*nf*(91865./1458. + 12848.*Zeta3/81. + 448.*Zeta4/9. - 5120.*Zeta5/27.)
-              +nf*nf*nf*nf*(-260./243 - 320.*Zeta3/243. + 64.*Zeta4/27.)
-              )/(4*4*4*4*4);
-
-
-     for(int i=0; i<5; i++) {
-       B[i]=Beta[i]/Beta[0];
-       Bp[i]=Betap[i]/Betap[0];
-       C[i]=Gamma[i]/Beta[0];
-     }
-}
-
-
-// Function int CRunDec::GetNf()
-// Returns number of active flavours.
-int CRunDec::GetNf(){
-     return (int)Nf;
-}
-
-// Function void CRunDec::SetNf(int nf)
-// Set the private component Nf to the number of active flavours.
-void CRunDec::SetNf(int nf){
-     this->SetConstants(nf);
-}
-
-// Aux. function to exit function.
-int CRunDec::Abbruch(void){
-     RETURN
-}
-
-// PolyLog[n,x] for -1 < x < 1 and positive integer n
-double CRunDec::PolyLog(unsigned int n, double x) {
-     if(x >= 1 || x <= -1 || n == 0){
-       cout << "PolyLog NOT IMPLEMENTED FOR n = " << n << " and x = " << x << endl;
-       RETURN
-     }
-     double m = n;
-     double ret = 0.0;
-     double sav1 = 1.0;
-     double sav2 = 0.0;
-     double diff = 1.0;
-     double k = 1.0;
-     while(abs(diff) > 1e-16) {
-       sav2 = sav1;
-       sav1 = pow(x,k)*pow(k,-m);
-       ret += sav1;
-       diff = sav2 - sav1;
-       k += 1.0;
-     }
-     return ret;
-}
-
-// Function double CRunDec::LamExpl(double AlphaS, double Mu, int nl)
-// Compute \Lambda using eq.(4) of [RunDec].
-double CRunDec::LamExpl(double AlphaS, double Mu, int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     double A=AlphaS/Pi;
-     double sum[5];
-     sum[0]= 1./(A*Beta[0]);
-     sum[1]= (B[1]*log(A))/Beta[0]
-              + (B[1]/Beta[0])*log(Beta[0]);
-     sum[2]= (B[2]*A - B[1]*B[1]*A )/Beta[0];
-     sum[3]= (0.5*B[3]*A*A-B[1]*B[2]*A*A+ 0.5*B[1]*B[1]*B[1]*A*A)/Beta[0];
-     sum[4]= (B[4]/3.-2.*B[3]*B[1]/3. - B[2]*B[2]/3. + B[2]*B[1]*B[1] - B[1]*B[1]*B[1]*B[1]/3.)*A*A*A/Beta[0];
-
-     double LogM2L2=0.0;
-     for(int i=1; i<=nl; i++){
-       LogM2L2+=sum[i-1];
-     }
-
-     double Lambda= Mu*exp(-0.5*LogM2L2);
-     return Lambda;
-}
-
-// Function double CRunDec::AlphasLam(double Lambda, double Mu, int nl)
-// Compute \alpha_s using eq.(5) of [RunDec].
-double CRunDec::AlphasLam(double Lambda, double Mu, int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     if(Mu/Lambda<1.5){
-       cout<<"WARNING: the ratio \\mu/\\lambda = "<< Mu/Lambda
-             <<" is very small!"<<endl;
-       RETURN
-     }
-     double L=log(Mu*Mu/(Lambda*Lambda));
-     double h=1/(L*Beta[0]);
-     double c=log(L);
-     double sum[4];
-     sum[0]= h;
-     sum[1]= -h*h*B[1]*c;
-     sum[2]= + h*h*h*(B[1]*B[1]*(c*c-c-1)+B[2]);
-     sum[3]= h*h*h*h*(B[1]*B[1]*B[1]*(-c*c*c+2.5*c*c+2*c-0.5)
-                   -3*B[1]*B[2]*c +0.5*B[3]);
-     sum[4]= h*h*h*h*h*(B[4]/3. + B[3]*B[1]*(-1./6.-2.*c) + 5.*B[2]*B[2]/3. +
-                        B[2]*B[1]*B[1]*(6.*c*c-3.*c-3.)+B[1]*B[1]*B[1]*B[1]*(c*c*c*c-13.*c*c*c/3.-3.*c*c/2.+4.*c+7./6.));
-     double a=0.0;
-     for(int i=1; i<=nl; i++){
-       a+=sum[i-1];
-     }
-     return a*Pi;
-}
-
-// Eq.(5) rewritten in a form suitable to determine zero.
-double CRunDec::fSetAsL(double Lambda, double Mu, int nl, double AlphaS){
-     double L=log(Mu*Mu/(Lambda*Lambda));
-     double h=1/(L*Beta[0]);
-     double c=log(L);
-     double sum[4];
-     sum[0]= h;
-     sum[1]= -h*h*B[1]*c;
-     sum[2]= + h*h*h*(B[1]*B[1]*(c*c-c-1)+B[2]);
-     sum[3]= h*h*h*h*(B[1]*B[1]*B[1]*(-c*c*c+2.5*c*c+2*c-0.5)
-                   -3*B[1]*B[2]*c +0.5*B[3]);
-     sum[4]= h*h*h*h*h*(B[4]/3. + B[3]*B[1]*(-1./6.-2.*c) + 5.*B[2]*B[2]/3. +
-                        B[2]*B[1]*B[1]*(6.*c*c-3.*c-3.)+B[1]*B[1]*B[1]*B[1]*(c*c*c*c-13.*c*c*c/3.-3.*c*c/2.+4.*c+7./6.));
-     double Add=0.0;
-     for(int i=1; i<=nl; i++) Add+=sum[i-1];
-     return (Add-(AlphaS/Pi));
-}
-
-// Function double CRunDec::LamImpl(double AlphaS, double Mu,int nl)
-// Compute \Lambda using eq.(5) of [RunDec].
-double CRunDec::LamImpl(double AlphaS, double Mu,int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     double epsilonX= 1e-8;
-     double Lambda0=LamExpl(AlphaS,Mu,nl);
-     double x0=Lambda0 - 0.2*Lambda0;
-     double x1=Lambda0 + 0.2*Lambda0;
-     double f0= this->fSetAsL(x0,Mu,nl,AlphaS);
-     double f1= this->fSetAsL(x1,Mu,nl,AlphaS);
-     if(f0*f1>0){
-       cout<<"WARNING: No root can be calculatet!"<<endl;
-       RETURN
-     }
-     double xTest;
-     double fTest;
-     do{
-       xTest= (x0+x1)/2;
-       fTest= fSetAsL(xTest,Mu,nl,AlphaS);
-       if(f0*fTest<0){x1= xTest;}
-       else {x0= xTest;}
-     }
-     while(abs(x1-x0)>= epsilonX);
-     double Lambda=xTest;
-     return Lambda;
-}
-
-// Right-hand side of differential equation for \alpha_s times 1/\mu^2,
-// see eq.(1) of [1].
-double fSetdydx(CRunDec S, double A,int nl){
-     double f=0.0;
-     double sum[5];
-     double B=A*A;
-     sum[0]=-S.Beta[0]*B;
-     sum[1]=-S.Beta[1]*B*A;
-     sum[2]=-S.Beta[2]*B*B;
-     sum[3]=-S.Beta[3]*B*B*A;
-     sum[4]=-S.Beta[4]*B*B*B;
-     for(int i=1; i<= nl; i++) {
-       f+=sum[i-1];
-     }
-     return (f*2);
-}
-
-// Implicit Runge-Kutte step (4th order)
-// Call with x=\mu^2, y=\alpha_s(\mu)/\pi, step size h, number of loops nl
-// New y value is returned at x+h
-double CRunDec::fRungeKuttaImpl(double &x, double y, double &htry, int nl,
-                              double (*f)(CRunDec, double, int)){
-     // Precision
-     double eps=1e-10;
-     double yerr,ytemp,htemp, hnext;
-     double h=htry;
-     double xnew; // new variable
-     double k1,k2,k3,k4,k5,k6;
-     for(;;){
-       k1=h*f(*this,y,nl);
-       k2=h*f(*this,y+b21*k1,nl);
-       k3=h*f(*this,y+b31*k1+b32*k2,nl);
-       k4=h*f(*this,y+b41*k1+b42*k2+b43*k3,nl);
-       k5=h*f(*this,y+b51*k1+b52*k2+b53*k3+b54*k4,nl);
-       k6=h*f(*this,y+b61*k1+b62*k2+b63*k3+b64*k4+b65*k5,nl);
-       // y value at x+h as a sum of the previous value and the
-       // correspondingly weighted function evaluations
-       ytemp= y+ c1*k1+ c2*k2+ c3*k3+ c4*k4+ c5*k5+ c6*k6;
-       // Estimate of uncertainty
-       yerr=dc1*k1 + dc2*k2 + dc3*k3 + dc4*k4 + dc5*k5 + dc6*k6;
-       double err=0.;
-       err=fmax(err,fabs(yerr/eps));
-
-       // Uncertainty too big? -> Discard result and reduce step size
-       if(err>1.){
-         htemp=0.9*h*pow(err,-0.25);
-         if(h>=0.){h=fmax(htemp,0.1*h);}
-         else{h=fmin(htemp,0.1*h);}
-         xnew=x+h;  // modification to previous code
-         //decide whether reduced stepsize is still big enough
-         //(in order to prevent a closed loop)
-         if(xnew==x){cout<<"stepsize too small"<<endl; RETURN}
-         continue;
-       }
-       else{
-         if(err>1.89e-4){
-         hnext=0.9*h*pow(err,-0.2);
-         }
-         // Uncertainty OK? -> take y value, increase h
-         else{
-           hnext=5.*h;
-         }
-         x+=h;
-
-         y=ytemp;
-         htry=hnext;
-         break;
-       }
-     }
-     return y;
-}
-
-// Function: double CRunDec::AlphasExact(double AlphaS0, double Mu0,
-//                           double MuEnd, int nl)
-// Compute \alpha_s using eq.(1) of [RunDec]
-double CRunDec::AlphasExact(double AlphaS0, double Mu0, double MuEnd, int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     double Lambda=LamExpl(AlphaS0,Mu0,nl);
-     if(MuEnd/Lambda<1.5){
-       cout<<"WARNING: the ratio \\mu/\\lambda = "<< MuEnd/Lambda
-         <<" is very small!"<<endl;
-       RETURN
-     }
-     double x,y;
-     x=log(Mu0);
-     y=AlphaS0/Pi;
-     double h;
-
-     if(Mu0<MuEnd){
-       h=1e-4;
-       while(x<(log(MuEnd))){
-         y=this->fRungeKuttaImpl(x,y,h,nl,fSetdydx);
-         if(x+h>=log(MuEnd)){
-           h=log(MuEnd)-x;
-         }
-       }
-     return(y*Pi);
-     }
-     else{h=-1e-4;}
-     while(x>(log(MuEnd))){
-       y=this->fRungeKuttaImpl(x,y,h,nl,fSetdydx);
-       if(x+h<=log(MuEnd)){
-         h=log(MuEnd)-x;
-       }
-     }
-     return(y*Pi);
-}
-
-// Eq.(10) of [RunDec]
-double CRunDec::fSetcx(double x, int nl){
-     double sum[5];
-     sum[0]=1;
-     sum[1]=(C[1]-B[1]*C[0])*x;
-     sum[2]=0.5*((C[1]-B[1]*C[0])*(C[1]-B[1]*C[0]) + C[2] - B[1]*C[1]+
-           B[1]*B[1]*C[0] - B[2]*C[0])*x*x;
-     sum[3]=((C[1]-B[1]*C[0])*(C[1]-B[1]*C[0])*(C[1]-B[1]*C[0])/6. +
-           0.5*(C[1]-B[1]*C[0])*(C[2]-B[1]*C[1]+B[1]*B[1]*C[0]-B[2]*C[0])+
-           (C[3]-B[1]*C[2]+B[1]*B[1]*C[1]-B[2]*C[1]-B[1]*B[1]*B[1]*C[0] +
-            2.*B[1]*B[2]*C[0] - B[3]*C[0])/3.)*x*x*x;
-     sum[4]=((C[1]-B[1]*C[0])*(C[1]-B[1]*C[0])*(C[1]-B[1]*C[0])*(C[1]-B[1]*C[0])/24.
-             +(C[1]-B[1]*C[0])*(C[1]-B[1]*C[0])*(C[2]/2. - B[1]*C[1]/2.+ B[1]*B[1]*C[0]/2. - B[2]*C[0]/2.)/2.
-             +(C[2]/2. - B[1]*C[1]/2.+ B[1]*B[1]*C[0]/2. - B[2]*C[0]/2.)*(C[2]/2. - B[1]*C[1]/2.+ B[1]*B[1]*C[0]/2. - B[2]*C[0]/2.)/2.
-             +((C[1]-B[1]*C[0])*(C[3]-B[1]*C[2]+B[1]*B[1]*C[1]-B[2]*C[1]-B[1]*B[1]*B[1]*C[0] + 2.*B[1]*B[2]*C[0] - B[3]*C[0])/3.)
-             +B[1]*B[1]*B[1]*B[1]*C[0]/4. - 3.*B[1]*B[1]*B[2]*C[0]/4. + B[2]*B[2]*C[0]/4. + B[1]*B[3]*C[0]/2. - B[4]*C[0]/4.
-             -B[1]*B[1]*B[1]*C[1]/4. + B[1]*B[2]*C[1]/2. - B[3]*C[1]/4. + B[1]*B[1]*C[2]/4. - B[2]*C[2]/4. - B[1]*C[3]/4. + C[4]/4.)*x*x*x*x;
-     double erg=0.0;
-     for(int i=1; i<=nl; i++){
-       erg+=sum[i-1];
-     }
-     return (pow(x,C[0])*erg);
-}
-
-// Function double CRunDec::mMS2mMS(double mmu0, double AlphaS0,
-//                          double AlphaSEnd, int nl)
-// Compute m_q(\mu) using eqs.(9) and (10) of [RunDec]
-double CRunDec::mMS2mMS(double mmu0, double AlphaS0, double AlphaSEnd, int nl){
-     if(nl<0||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     if(nl==0){
-       return mmu0;
-     }
-     double cAlphaS0= this->fSetcx(AlphaS0/Pi, nl);
-     double cAlphaSEnd= this->fSetcx(AlphaSEnd/Pi, nl);
-     return mmu0*cAlphaSEnd/cAlphaS0;
-}
-
-// Aux. functions (r.h.s of diff. eqs. for alpha_s and m_q)
-double fSetdydxM1(CRunDec S, double A, double M){
-     return (M*(S.Gamma[0])/(S.Beta[0]*A));
-}
-
-double fSetdydxa1(CRunDec S, double x, double A){
-     if (x == 1.) x=1.;
-     return (-2.*(S.Beta[0]*A*A));
-}
-
-double fSetdydxM2(CRunDec S, double A, double M){
-     return (M*(S.Gamma[0]+S.Gamma[1]*A)/(S.Beta[0]*A+S.Beta[1]*A*A));
-}
-
-double fSetdydxa2(CRunDec S, double x, double A){
-     if (x == 1.) x=1.;
-     return (-2.*(S.Beta[0]*A*A+S.Beta[1]*A*A*A));
-}
-
-double fSetdydxM3(CRunDec S, double A, double M){
-     return (M*(S.Gamma[0]+S.Gamma[1]*A+S.Gamma[2]*A*A)/
-           (S.Beta[0]*A+S.Beta[1]*A*A+S.Beta[2]*A*A*A));
-}
-
-double fSetdydxa3(CRunDec S, double x, double A){
-     if (x == 1.) x=1.;
-     return (-2.*(S.Beta[0]*A*A+S.Beta[1]*A*A*A+S.Beta[2]*A*A*A*A));
-}
-
-double fSetdydxM4(CRunDec S, double A, double M){
-     return (M*(S.Gamma[0]+S.Gamma[1]*A+S.Gamma[2]*A*A+S.Gamma[3]*A*A*A)/
-           (S.Beta[0]*A+S.Beta[1]*A*A+S.Beta[2]*A*A*A+S.Beta[3]*A*A*A*A));
-}
-
-double fSetdydxa4(CRunDec S, double x, double A){
-     if (x == 1.) x=1.;
-     return (-2.*(S.Beta[0]*A*A+S.Beta[1]*A*A*A+S.Beta[2]*A*A*A*A+
-                S.Beta[3]*A*A*A*A*A));
-}
-
-double fSetdydxM5(CRunDec S, double A, double M){
-     return (M*(S.Gamma[0]+S.Gamma[1]*A+S.Gamma[2]*A*A+S.Gamma[3]*A*A*A + S.Gamma[4]*A*A*A*A)/
-           (S.Beta[0]*A+S.Beta[1]*A*A+S.Beta[2]*A*A*A+S.Beta[3]*A*A*A*A+S.Beta[4]*A*A*A*A*A));
-}
-
-double fSetdydxa5(CRunDec S, double x, double A){
-     if (x == 1.) x=1.;
-     return (-2.*(S.Beta[0]*A*A+S.Beta[1]*A*A*A+S.Beta[2]*A*A*A*A+
-                S.Beta[3]*A*A*A*A*A+S.Beta[4]*A*A*A*A*A*A));
-}
-
-// Runge-Kutta step for implicit procedure
-double CRunDec::fRKSchritt(double x, double y, double h, double &yerr,
-                    double (*f)(CRunDec, double , double)){
-     double k1,k2,k3,k4,k5,k6;
-     k1=h*f(*this,x,y);
-     k2=h*f(*this,x+a2*h,y+b21*k1);
-     k3=h*f(*this,x+a3*h,y+b31*k1+b32*k2);
-     k4=h*f(*this,x+a4*h,y+b41*k1+b42*k2+b43*k3);
-     k5=h*f(*this,x+a5*h,y+b51*k1+b52*k2+b53*k3+b54*k4);
-     k6=h*f(*this,x+a6*h,y+b61*k1+b62*k2+b63*k3+b64*k4+b65*k5);
-
-     yerr=(dc1*k1 + dc2*k2 + dc3*k3 + dc4*k4 + dc5*k5 + dc6*k6);
-     return (y+ c1*k1+ c2*k2+ c3*k3+ c4*k4+ c5*k5+ c6*k6);
-}
-
-// Function AsmMS CRunDec::AsmMSrunexact(double mMu, double AlphaS0, double Mu0,
-//                         double MuEnd, int nl)
-// Compute \alpha_s and m_q solving diff. eqs. simultaneously.
-AsmMS CRunDec::AsmMSrunexact(double mMu, double AlphaS0, double Mu0,
-                             double MuEnd, int nl){
-     AsmMS Erg;
-     if(nl<0||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       this->Abbruch();
-     }
-     if(nl==0){
-       Erg.Asexact=AlphaS0;
-       Erg.mMSexact=mMu;
-       return Erg;
-     }
-     double yerr0,ytemp0,xnew,h=1e-3;
-     float eps=1e-15;
-     float errmax;
-     double x0=log(Mu0);
-     double y0=AlphaS0/Pi;
-     double xEnd=log(MuEnd);
-     double yscal0=abs(x0)+abs(h*y0);
-
-     double (*falpha)(CRunDec, double , double);
-     double (*fmMS)(CRunDec, double , double);
-
-     if(nl==1){
-       falpha=fSetdydxa1;
-       fmMS=fSetdydxM1;
-     }
-     if(nl==2){
-       falpha=fSetdydxa2;
-       fmMS=fSetdydxM2;
-     }
-     if(nl==3){
-       falpha=fSetdydxa3;
-       fmMS=fSetdydxM3;
-     }
-     if(nl==4){
-       falpha=fSetdydxa4;
-       fmMS=fSetdydxM4;
-     }
-     if(nl==5){
-       falpha=fSetdydxa5;
-       fmMS=fSetdydxM5;
-     }
-
-     if(Mu0<MuEnd){
-       h=1e-2;
-       while(x0<xEnd){
-         for(;;){
-           ytemp0=fRKSchritt(x0,y0,h,yerr0,falpha);
-           errmax=0.;
-           errmax=fmax(errmax,fabs((float)yerr0/yscal0));
-           errmax/=eps;
-           if(errmax>1){
-             h*=0.9;
-             xnew=x0+h;
-             if(xnew==x0){cout<<"stepsize too small!"<<endl;}
-             continue;
-           } //if
-           else{
-             x0+=h;
-             y0=ytemp0;
-             if(errmax>1.89e-4){h=0.9*h*pow((double)errmax,-0.2);}
-             else{h=5.*h;}
-             break;
-           }//else
-         }//for
-         if(x0+h>=xEnd){
-           h=xEnd-x0;
-         }//if
-       }//while
-       Erg.Asexact=y0*Pi;
-
-       x0=AlphaS0/Pi;
-       xEnd=y0;
-       y0=mMu;
-       yscal0=abs(x0)+abs(h*y0);
-       eps=1e-10;
-       h=-1e-3;
-
-       while(x0>xEnd){
-         for(;;){
-           ytemp0=fRKSchritt(x0,y0,h,yerr0,fmMS);
-           errmax=0.;
-           errmax=fmax(errmax,fabs((float)yerr0/yscal0));
-           errmax/=eps;
-           if(errmax>1){
-             h*=0.9;
-             xnew=x0+h;
-             if(xnew==x0){cout<<"stepsize too small!"<<endl;}
-             continue;
-           } //if
-           else{
-             x0+=h;
-             y0=ytemp0;
-             if(errmax>1.89e-4){h=0.9*h*pow((double)errmax,-0.2);}
-             else{h=5.*h;}
-             break;
-           }//else
-         }//for
-         if(x0+h<=xEnd){
-           h=xEnd-x0;
-         }//if
-       }//while
-       Erg.mMSexact=y0;
-       return Erg;
-     }//if
-     else{
-       h=-1e-2;
-       while(x0>xEnd){
-         for(;;){
-           ytemp0=fRKSchritt(x0,y0,h,yerr0,falpha);
-           errmax=0.;
-           errmax=fmax(errmax,fabs((float)yerr0/yscal0));
-           errmax/=eps;
-           if(errmax>1){
-             h*=0.9;
-             xnew=x0+h;
-             if(xnew==x0){cout<<"stepsize too small!"<<endl;}
-             continue;
-           } //if
-           else{
-             x0+=h;
-             y0=ytemp0;
-             if(errmax>1.89e-4){h=0.9*h*pow((double)errmax,-0.2);}
-             else{h=5.*h;}
-             break;
-           }//else
-         }//for
-         if(x0+h<=xEnd){
-           h=xEnd-x0;
-         }//if
-       }//while
-       Erg.Asexact=y0*Pi;
-
-       x0=AlphaS0/Pi;
-       xEnd=y0;
-       y0=mMu;
-       yscal0=abs(x0)+abs(h*y0);
-       eps=1e-10;
-       h=1e-3;
-       while(x0<xEnd){
-         for(;;){
-           ytemp0=fRKSchritt(x0,y0,h,yerr0,fmMS);
-           errmax=0.;
-           errmax=fmax(errmax,fabs((float)yerr0/yscal0));
-           errmax/=eps;
-           if(errmax>1){
-             h*=0.9;
-             xnew=x0+h;
-             if(xnew==x0){cout<<"stepsize too small!"<<endl;}
-             continue;
-           } //if
-           else{
-             x0+=h;
-             y0=ytemp0;
-             if(errmax>1.89e-4){h=0.9*h*pow((double)errmax,-0.2);}
-             else{h=5.*h;}
-             break;
-           }//else
-         }//for
-         if(x0+h>=xEnd){
-           h=xEnd-x0;
-         }//if
-       }//while
-       Erg.mMSexact=y0;
-       return Erg;
-     }//else
-}
-
-// Coefficients of eq.(13) of [RunDec]
-double CRunDec::fMsFromOs1(double mu, double M){
-     double lmM=log((mu*mu)/(M*M));
-     double erg;
-     erg= (double) (-cf - (3.*cf*lmM)/4.);
-     return erg;
-}
-
-double CRunDec::fMsFromOs2(double mu, double M, double nl){
-     double lmM=log((mu*mu)/(M*M));
-     double erg;
-     erg= (double) ((-1111.*ca*cf)/384. + (7.*cf*cf)/128. -
-     (185.*ca*cf*lmM)/96. + (21.*cf*cf*lmM)/32. - (11.*ca*cf*lmM*lmM)/32. +
-     (9.*cf*cf*lmM*lmM)/32. + (143.*cf*tr)/96. + (13.*cf*lmM*tr)/24. +
-     (cf*lmM*lmM*tr)/8. +
-     (71.*cf*nl*tr)/96. + (13.*cf*lmM*nl*tr)/24. + (cf*lmM*lmM*nl*tr)/8. +
-     (ca*cf*Zeta2)/2 - (15.*cf*cf*Zeta2)/8. - (3.*ca*cf*log(2)*Zeta2)/2. +
-     3.*cf*cf*log(2)*Zeta2 -
-     cf*tr*Zeta2 + (cf*nl*tr*Zeta2)/2. + (3.*ca*cf*Zeta3)/8. -
-     (3.*cf*cf*Zeta3)/4.);
-     return erg;
-}
-
-double CRunDec::fMsFromOs3(double mu, double M, double nl){
-     double lmM=log((mu*mu)/(M*M));
-     double erg;
-     erg= (double) (lmM*lmM*(-2341.*ca*ca*cf + 1962.*ca*cf*cf - 243.*cf*cf*cf
-     + 1492.*ca*cf*tr -
-      468.*cf*cf*tr + 1492.*ca*cf*nl*tr - 468.*cf*cf*nl*tr - 208.*cf*tr*tr -
-      416.*cf*nl*tr*tr - 208.*cf*nl*nl*tr*tr))/1152. +
-     (lmM*lmM*lmM*(-242.*ca*ca*cf + 297.*ca*cf*cf - 81.*cf*cf*cf +
-     176.*ca*cf*tr - 108.*cf*cf*tr + 176.*ca*cf*nl*tr - 108.*cf*cf*nl*tr -
-     32.*cf*tr*tr - 64.*cf*nl*tr*tr - 32.*cf*nl*nl*tr*tr))/1152. +
-     (lmM*(-105944.*ca*ca*cf + 52317.*ca*cf*cf - 13203.*cf*cf*cf +
-     74624.*ca*cf*tr -
-     5436.*cf*cf*tr + 55616.*ca*cf*nl*tr + 2340.*cf*cf*nl*tr -
-     12608.*cf*tr*tr -
-     18304.*cf*nl*tr*tr - 5696.*cf*nl*nl*tr*tr + 12672.*ca*ca*cf*Zeta2 -
-     52704.*ca*cf*cf*Zeta2 + 19440.*cf*cf*cf*Zeta2 -
-     38016.*ca*ca*cf*log(2)*Zeta2 +
-     91584.*ca*cf*cf*log(2)*Zeta2 - 31104.*cf*cf*cf*log(2)*Zeta2 -
-     29952.*ca*cf*tr*Zeta2 +
-     27648.*cf*cf*tr*Zeta2 + 13824.*ca*cf*log(2)*tr*Zeta2 -
-     27648.*cf*cf*log(2)*tr*Zeta2 +
-     8064.*ca*cf*nl*tr*Zeta2 + 12096.*cf*cf*nl*tr*Zeta2 +
-     13824.*ca*cf*log(2)*nl*tr*Zeta2 -
-     27648.*cf*cf*log(2)*nl*tr*Zeta2 + 9216.*cf*tr*tr*Zeta2 +
-     4608.*cf*nl*tr*tr*Zeta2 -
-     4608.*cf*nl*nl*tr*tr*Zeta2 + 9504.*ca*ca*cf*Zeta3 -
-     22896.*ca*cf*cf*Zeta3 +
-     7776.*cf*cf*cf*Zeta3 + 6912.*ca*cf*tr*Zeta3 - 3456.*cf*cf*tr*Zeta3 +
-     6912.*ca*cf*nl*tr*Zeta3 - 3456.*cf*cf*nl*tr*Zeta3))/13824.;
-     return erg;
-}
-
-//z[3,m](M) according to eq.(15)
-double CRunDec::fZmM(double nl){
-     double erg;
-     erg= (double) -9478333./93312. + 55.*log(2)*log(2)*log(2)*log(2)/162. +
-            (-644201./6480. + 587.*log(2)/27. + 44.*log(2)*log(2)/27.)*Zeta2 -
-            61.*Zeta3/27. + 3475*Zeta4/432. + 1439.*Zeta2*Zeta3/72. -
-            1975.*Zeta5/216. + 220.*A4/27. + nl*(246643./23328. -
-            log(2)*log(2)*log(2)*log(2)/81. +(967./108. + 22.*log(2)/27. -
-            4.*log(2)*log(2)/27.)*Zeta2 + 241.*Zeta3/72. - 305.*Zeta4/108. -
-            8.*A4/27.) + nl*nl*(-2353./23328. - 13.*Zeta2/54 - 7.*Zeta3/54.);
-     return erg;
-}
-
-double CRunDec::fMsFromOs4(double mu, double M, double nl, double err){
-     double lmM=log((mu*mu)/(M*M));
-     double erg;
-
-     erg =  - 3654.15040757339*err - 1524.2292266911543*lmM - 288.778291935394*lmM*lmM - 32.54735725308642*lmM*lmM*lmM -
-            1.85546875*lmM*lmM*lmM*lmM +
-            nl*nl*nl*(0. + 0.678141025604516*err + 0.3205521521864135*lmM + 0.0800290327210927*lmM*lmM +
-            0.010030864197530864*lmM*lmM*lmM) +
-            nl*nl*(0. - 43.48241924867489*err - 19.82672048099557*lmM - 4.482957520194182*lmM*lmM -
-            0.5270061728395061*lmM*lmM*lmM - 0.04108796296296297*lmM*lmM*lmM*lmM) +
-            nl*(0. + 756.9421565599532*err + 330.1770776731065*lmM + 67.99849534415492*lmM*lmM +
-            7.595293209876542*lmM*lmM*lmM + 0.48119212962962954*lmM*lmM*lmM*lmM);
-     return erg;
-}
-
-// Function: double CRunDec::mOS2mMS(double mOS, std::pair<double,double>* mq, double asmu,
-//                           double Mu, int nl, double fdelm)
-double CRunDec::mOS2mMS(double mOS, std::pair<double,double>* mq, double asmu, double Mu,int nl, double fdelm){
-     if(nl<0||nl>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     if(nl == 4 && (Nf<4||Nf>6)){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR 4 LOOPS and "<< nl << " FLAVORS" <<endl;
-       RETURN
-     }
-     double sum[5];
-     double deltalight = deltamOS2mMS(mOS, mq, asmu/Pi, Mu, Nf-1, nl);
-     sum[0]=(double) 1.;
-     sum[1]=asmu*(this ->fMsFromOs1(Mu, mOS))/Pi;
-     sum[2]=asmu*asmu*(this-> fMsFromOs2(Mu, mOS, Nf-1))/(Pi*Pi);
-     sum[3]=asmu*asmu*asmu*(this-> fMsFromOs3(Mu, mOS, Nf-1)+this->fZmM(Nf-1))/(Pi*Pi*Pi);
-     sum[4]=asmu*asmu*asmu*asmu*(this->fMsFromOs4(Mu, mOS, Nf-1, fdelm))/(Pi*Pi*Pi*Pi);
-     double erg=0.0;
-     if(nl==0){
-       erg=1;
-     }
-     else{
-       for(int i=0; i<=nl; i++){
-         erg+=sum[i];
-       }
-     }
-     erg += deltalight;
-     return mOS*erg;
-}
-
-// Function: double CRunDec::mMS2mSI(double mMS, double asmu, double mu, int nl)
-double CRunDec::mMS2mSI(double mMS, double asmu, double mu, int nl){
-  double epsilonX = 1e-8;
-  AsmMS asmq;
-  asmq.Asexact  = asmu;
-  asmq.mMSexact = mMS;
-  for (;;) {
-    double mbold = asmq.mMSexact;
-    asmq = AsmMSrunexact(mMS, asmu, mu, mbold, nl);
-    if (abs(asmq.mMSexact - mbold) < epsilonX) break;
-  }
-  return asmq.mMSexact;
-}
-
-// Coefficients of eq.(18) of [RunDec]
-double CRunDec::fMsFromRi1(void){
-     return (double) -4./3.;
-}
-double CRunDec::fMsFromRi2(void){
-     double erg= (double) -995./72. + 19.*Zeta3/6. + 89.*Nf/144.;
-     return erg;
-}
-double CRunDec::fMsFromRi3(void){
-     double erg= (double) -6663911./41472. + 408007.*Zeta3/6912. -185.*Zeta5/36.
-                + (118325./7776. + 5*Zeta4/12. - 617.*Zeta3/216.)*Nf +
-                (-4459./23328. - Zeta3/54.)*Nf*Nf;
-     return erg;
-}
-
-// Function: double CRunDec::mRI2mMS(double mRI, double asmu, int nl)
-double CRunDec::mRI2mMS(double mRI, double asmu, int nl){
-     if(nl<0||nl>3){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     double sum[4];
-     sum[0]=(double) 1.;
-     sum[1]=asmu*(this ->fMsFromRi1())/Pi;
-     sum[2]=asmu*asmu*(this-> fMsFromRi2())/(Pi*Pi);
-     sum[3]=asmu*asmu*asmu*(this-> fMsFromRi3())/(Pi*Pi*Pi);
-     double erg=0.0;
-     if(nl==0){
-       erg=1;
-     }
-     else{
-       for(int i=0; i<=nl; i++){
-        erg+=sum[i];
-       }
-     }
-     return mRI*erg;
-}
-
-// Function: double CRunDec::mMS2mRGI(double mMS, double asmu, int nl)
-double CRunDec::mMS2mRGI(double mMS, double asmu, int nl){
-     if(nl<0||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     if(nl==0){
-       return (double) mMS;
-     }
-     else{
-       double cAsmu= this->fSetcx(asmu/Pi, nl);
-       return (double) mMS/cAsmu;
-     }
-}
-
-// Function: double CRunDec::mRGI2mMS(double mRGI, double asmu, int nl)
-double CRunDec::mRGI2mMS(double mRGI, double asmu, int nl){
-     if(nl<0||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     if(nl==0){
-       return (double) mRGI;
-     }
-     double cAsmu= this->fSetcx(asmu/Pi, nl);
-     return (double) mRGI*cAsmu;
-}
-
-// Coefficients of eq.(17) of [RunDec]
-double CRunDec::fOsFromMs1(double mu, double M){
-     double lmM=log((mu*mu)/(M*M));
-     double erg;
-     erg= (double) (cf + (3.*cf*lmM)/4.);
-     return erg;
-}
-
-double CRunDec::fOsFromMs2(double mu, double M, double nl){
-     double lmM=log((mu*mu)/(M*M));
-     double erg;
-     erg= (double) ((1111.*ca*cf)/384. - (71.*cf*cf)/128. -
-     (143.*cf*tr)/96. - (71.*cf*nl*tr)/96. +
-     lmM*((185.*ca*cf)/96. - (9.*cf*cf)/32. - (13.*cf*tr)/24. -
-     (13.*cf*nl*tr)/24.) +
-     lmM*lmM*((11.*ca*cf)/32. + (9.*cf*cf)/32. - (cf*tr)/8. - (cf*nl*tr)/8.) -
-     (ca*cf*Zeta2)/2. + (15.*cf*cf*Zeta2)/8. + (3.*ca*cf*log(2)*Zeta2)/2.
-     - 3.*cf*cf*log(2)*Zeta2 +
-     cf*tr*Zeta2 - (cf*nl*tr*Zeta2)/2. - (3.*ca*cf*Zeta3)/8. +
-     (3.*cf*cf*Zeta3)/4.);
-     return erg;
-}
-
-double CRunDec::fOsFromMs3(double mu, double M, double nl){
-     double lmM=log((mu*mu)/(M*M));
-     double erg;
-
-     erg= (double) (lmM*lmM*lmM*((121.*ca*ca*cf)/576. + (33.*ca*cf*cf)/128. +
-     (9.*cf*cf*cf)/128. - (11.*ca*cf*tr)/72. - (3.*cf*cf*tr)/32. -
-     (11.*ca*cf*nl*tr)/72. -
-     (3.*cf*cf*nl*tr)/32. + (cf*tr*tr)/36. + (cf*nl*tr*tr)/18. +
-     (cf*nl*nl*tr*tr)/36.) + lmM*lmM*((2341.*ca*ca*cf)/1152.
-     + (21.*ca*cf*cf)/64. -
-     (63.*cf*cf*cf)/128. - (373.*ca*cf*tr)/288. - (3.*cf*cf*tr)/32. -
-     (373.*ca*cf*nl*tr)/288. - (3.*cf*cf*nl*tr)/32. + (13.*cf*tr*tr)/72. +
-     (13.*cf*nl*tr*tr)/36. + (13.*cf*nl*nl*tr*tr)/72.) +
-     lmM*((13243.*ca*ca*cf)/1728. - (4219.*ca*cf*cf)/1536. +
-     (495.*cf*cf*cf)/512. -
-     (583.*ca*cf*tr)/108. - (307.*cf*cf*tr)/384. - (869.*ca*cf*nl*tr)/216. -
-     (91.*cf*cf*nl*tr)/384. + (197.*cf*tr*tr)/216. + (143.*cf*nl*tr*tr)/108. +
-     (89.*cf*nl*nl*tr*tr)/216. - (11.*ca*ca*cf*Zeta2)/12. +
-     (49.*ca*cf*cf*Zeta2)/16. +
-     (45.*cf*cf*cf*Zeta2)/32. + (11.*ca*ca*cf*log(2)*Zeta2)/4. -
-     (35.*ca*cf*cf*log(2)*Zeta2)/8. -
-     (9.*cf*cf*cf*log(2)*Zeta2)/4. + (13.*ca*cf*tr*Zeta2)/6. -
-     (cf*cf*tr*Zeta2)/2. -
-     ca*cf*log(2)*tr*Zeta2 + 2.*cf*cf*log(2)*tr*Zeta2 -
-     (7.*ca*cf*nl*tr*Zeta2)/12. -
-     (13.*cf*cf*nl*tr*Zeta2)/8. - ca*cf*log(2)*nl*tr*Zeta2 +
-     2.*cf*cf*log(2)*nl*tr*Zeta2 -
-     (2.*cf*tr*tr*Zeta2)/3. - (cf*nl*tr*tr*Zeta2)/3. +
-     (cf*nl*nl*tr*tr*Zeta2)/3. -
-     (11.*ca*ca*cf*Zeta3)/16. + (35.*ca*cf*cf*Zeta3)/32. +
-     (9.*cf*cf*cf*Zeta3)/16. -
-     (ca*cf*tr*Zeta3)/2. + (cf*cf*tr*Zeta3)/4. - (ca*cf*nl*tr*Zeta3)/2. +
-     (cf*cf*nl*tr*Zeta3)/4.));
-     return erg;
-}
-
-double CRunDec::fOsFromMs4(double mu, double M, double nl, double err){
-     double lmM=log((mu*mu)/(M*M));
-     double erg;
-     erg = 3567.602784989066*err + 1727.2260148986106*lmM + 409.2429990574718*lmM*lmM + 66.93663194444443*lmM*lmM*lmM +
-           8.056278935185185*lmM*lmM*lmM*lmM +
-           nl*nl*nl*(-0.678141025604516*err - 0.3205521521864134*lmM - 0.0800290327210927*lmM*lmM -
-           0.010030864197530864*lmM*lmM*lmM) +
-           nl*(-745.7207145811878*err - 358.29765085086774*lmM - 87.39262571554698*lmM*lmM -
-           11.883873456790122*lmM*lmM*lmM - 1.2705439814814814*lmM*lmM*lmM*lmM) +
-           nl*nl*(43.396250117985666*err + 20.528466368867228*lmM + 4.971905254812516*lmM*lmM +
-           0.6304012345679011*lmM*lmM*lmM + 0.06655092592592593*lmM*lmM*lmM*lmM);
-     return erg;
-}
-
-// Compute 2 Loop contribution to mOS2mMS at 3 loops for MS light quarks
-double CRunDec::deltamOS2mMS(double mOS, std::pair<double,double>* mq, double asmu, double mu, int nlq, int nloops){
-     double erg=0.0;
-     if(!mq)
-       return 0.0;
-
-     for(int i = 0; i < 4; i++) {
-       if(mq[i].first == 0.0)
-        continue;
-
-       double x = mq[i].first/mOS;
-       double muf = mq[i].second;
-       int nl = nlq-i;
-       if(nloops >= 2) {
-         erg += asmu*asmu*2./3.*(48.*x*x*x*x*log(x)*log(x) + 48.*x*x*log(x)+72.*x*x + 8.*Pi*Pi*(x*x*x*x-3.*x*x*x-3.*x)
-                -48.*(x+1.)*(x+1.)*(x*x - x + 1.)*(log(x)*log(x+1) + PolyLog(2,-x))
-                -48.*(x-1.)*(x-1.)*(x*x + x + 1.)*(log(x)*log(1-x) + PolyLog(2,x)))/96.;
-       }
-       if(nloops >= 3) {
-         erg += asmu*asmu*asmu*(-21.8714*x - 4.348*x*x - 1.02211*x*x*x - 0.0493333*x*x*x*x + nl*(0.982667*x + 0.300333*x*x)
-              + log(mu*mu/(mOS*mOS))*(-6.61056*x + 2.46511*x*x - 0.724333*x*x*x + nl*(0.534667*x - 0.22*x*x + 0.067*x*x*x))
-              + log(x)*(16.9477*x - 1.10133*nl*x + 2.78756*x*x - 0.0343333*x*x*x)
-              + 8./9.*(3./2.*log(muf*muf/(mq[i].first*mq[i].first))+2.)*x/24.*(24.*x*x*x*log(x)*log(x) + 12.*x*log(x)+ 24.*x
-              + Pi*Pi*(4.*x*x*x-9.*x*x-3.) - 6.*(4.*x*x*x + 3.*x*x + 1.)*(log(x)*log(x+1) + PolyLog(2,-x))
-              -6.*(x-1.)*(4.*x*x + x + 1.)*(log(x)*log(1-x) + PolyLog(2,x))));
-       }
-     }
-
-     return erg;
-}
-
-// Compute 2 Loop contribution to mMS2mOS at 3 loops for MS light quarks
-double CRunDec::deltamMS2mOS(double mMS, std::pair<double,double>* mq, double asmu, double mu, int nlq, int nloops){
-     double erg=0.0;
-     double lmu = log(mu*mu/(mMS*mMS));
-     if(!mq)
-       return 0.0;
-
-     for(int i = 0; i < 4; i++) {
-       if(mq[i].first == 0.0)
-        continue;
-
-       double x = mq[i].first/mMS;
-       double muf = mq[i].second;
-       int nl = nlq-i;
-       if(nloops >= 2) {
-         erg += -asmu*asmu*2./3.*(48.*x*x*x*x*log(x)*log(x) + 48.*x*x*log(x)+72.*x*x + 8.*Pi*Pi*(x*x*x*x-3.*x*x*x-3.*x)
-                -48.*(x+1.)*(x+1.)*(x*x - x + 1.)*(log(x)*log(x+1) + PolyLog(2,-x))
-                -48.*(x-1.)*(x-1.)*(x*x + x + 1.)*(log(x)*log(1-x) + PolyLog(2,x)))/96.;
-       }
-       if(nloops >= 3) {
-         erg += -asmu*asmu*asmu*(-21.8714*x - 4.348*x*x - 1.02211*x*x*x - 0.0493333*x*x*x*x + nl*(0.982667*x + 0.300333*x*x)
-              + lmu*(-6.61056*x + 2.46511*x*x - 0.724333*x*x*x + nl*(0.534667*x - 0.22*x*x + 0.067*x*x*x))
-              + log(x)*(16.9477*x - 1.10133*nl*x + 2.78756*x*x - 0.0343333*x*x*x)
-              + 8./9.*(3./2.*log(muf*muf/(mq[i].first*mq[i].first))+2.)*x/24.*(24.*x*x*x*log(x)*log(x) + 12.*x*log(x)+ 24.*x
-              + Pi*Pi*(4.*x*x*x-9.*x*x-3.) - 6.*(4.*x*x*x + 3.*x*x + 1.)*(log(x)*log(x+1) + PolyLog(2,-x))
-              -6.*(x-1.)*(4.*x*x + x + 1.)*(log(x)*log(1-x) + PolyLog(2,x))))
-              + asmu*asmu*asmu*8./9.*(48.*(3.*lmu + 7.)*x*x*x*x*log(x)*log(x) + 144.*x*x*log(x)+312.*x*x
-              + 8.*Pi*Pi*(7.*x*x*x*x-15.*x*x*x-3.*x) - lmu*(-72.*x*x +
-              + 12.*Pi*Pi*(-2.*x*x*x*x+3.*x*x*x - 3*x))
-              - 48.*((7.*x+5.)*x*x*x + x + 3.*lmu/2.*(2.*x*x*x*x+x*x*x-x-2.) -1.)*(log(x)*log(x+1) + PolyLog(2,-x))
-              - 48.*(x-1.)*(3.*lmu/2.*(2.*x*x*x+x*x+x+2.) + 7.*x*x*x + 2.*x*x + 2.*x + 1.)*(log(x)*log(1-x) + PolyLog(2,x)))/192.;
-       }
-     }
-
-     return erg;
-}
-
-// z_m^inv
-double CRunDec::fZmInvM(double nl){
-     double erg;
-     erg=(8481925./93312. +
-       (137.*nl)/216. + (652841.*Pi*Pi)/38880. - (nl*Pi*Pi)/27. -
-       (695.*Pi*Pi*Pi*Pi)/7776. - (575.*Pi*Pi*log(2))/162. -
-       (22.*Pi*Pi*log(2)*log(2))/81. -
-       (55.*log(2)*log(2)*log(2)*log(2))/162. - (220.*A4)/27. -
-       nl*nl*(-2353./23328. - (13.*Pi*Pi)/324. - (7.*Zeta3)/54.) +
-       (58.*Zeta3)/27. -
-       (1439.*Pi*Pi*Zeta3)/432. - nl*(246643./23328. + (967.*Pi*Pi)/648. -
-       (61.*Pi*Pi*Pi*Pi)/1944. + (11.*Pi*Pi*log(2))/81. -
-       (2.*Pi*Pi*log(2)*log(2))/81. -
-       log(2)*log(2)*log(2)*log(2)/81. - (8.*A4)/27. +
-       (241.*Zeta3)/72.) +
-       (1975.*Zeta5)/216.);
-     return erg;
-}
-
-// Function: double CRunDec::mMS2mOS(double mMS, std::pair<double,double>* mq, double asmu,
-//                           double mu,int nl)
-double CRunDec::mMS2mOS(double mMS, std::pair<double,double>* mq, double asmu, double mu, int nl, double fdelm){
-     if(nl<0||nl>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     if(nl == 4 && (Nf<4||Nf>6)){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR 4 LOOPS and "<< nl << " FLAVORS"<<endl;
-       RETURN
-     }
-     double deltalight = deltamMS2mOS(mMS, mq, asmu/Pi, mu, Nf-1, nl);
-     double sum[5];
-     sum[0]=(double) 1.;
-     sum[1]=asmu*(this ->fOsFromMs1(mu, mMS))/Pi;
-     sum[2]=asmu*asmu*((this-> fOsFromMs2(mu, mMS, Nf-1)))/(Pi*Pi);
-     sum[3]=asmu*asmu*asmu*(this-> fOsFromMs3(mu, mMS, Nf-1)+
-           this->fZmInvM(Nf-1))/(Pi*Pi*Pi);
-     sum[4]=asmu*asmu*asmu*asmu*(this->fOsFromMs4(mu, mMS, Nf-1, fdelm))/(Pi*Pi*Pi*Pi);
-     double erg=0.0;
-     if(nl==0){
-       erg=1;
-     }
-     else{
-       for(int i=0; i<=nl; i++){
-         erg+=sum[i];
-       }
-     }
-     erg += deltalight;
-     return mMS*erg;
-}
-
-// Function: double CRunDec::mMS2mOSmod(double mMS, std::pair<double,double>* mq, double asmu,
-//                           double mu, int nf, int nloop, double fdelm), needed for several other mass relations
-double CRunDec::mMS2mOSmod(double mMS, std::pair<double,double>* mq, double asmu, double mu,int nf, int nloop, double fdelm){
-     if(nloop<0||nloop>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloop <<" LOOPS"<<endl;
-       RETURN
-     }
-     if(nloop == 4 && (nf<4||nf>6)){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR 4 LOOPS and "<< nf << " FLAVORS"<<endl;
-       RETURN
-     }
-     SetConstants(nf);
-     double sum[5];
-     double lmm = log((mu*mu)/(mMS*mMS));
-     sum[0]=(double) 1.;
-
-
-     sum[1]=asmu*(this ->fOsFromMs1(mu, mMS))/(Pi);
-     sum[2]=asmu*asmu*((this-> fOsFromMs2(mu, mMS, Nf-1)))/(Pi*Pi) +
-            asmu*asmu*(lmm)/(6.*Pi)*(this ->fOsFromMs1(mu, mMS))/(Pi);
-     sum[3]=asmu*asmu*asmu*(this-> fOsFromMs3(mu, mMS, Nf-1)+this->fZmInvM(Nf-1))/(Pi*Pi*Pi)+
-            asmu*asmu*asmu*2.*(lmm)/(6.*Pi)*((this-> fOsFromMs2(mu, mMS, Nf-1)))/(Pi*Pi)+
-            asmu*asmu*asmu*(-11./72. + (11.*lmm)/24. + lmm*lmm/36.)/(Pi*Pi)*(this ->fOsFromMs1(mu, mMS))/(Pi);
-     sum[4]=asmu*asmu*asmu*asmu*(this->fOsFromMs4(mu, mMS, Nf-1, fdelm))/(Pi*Pi*Pi*Pi) +
-			asmu*asmu*asmu*asmu*3.*(lmm)/(6.*Pi)*(this-> fOsFromMs3(mu, mMS, Nf-1)+this->fZmInvM(Nf-1))/(Pi*Pi*Pi) +
-            asmu*asmu*asmu*asmu*2.*(-11./72. + (11.*lmm)/24. + lmm*lmm/36.)/(Pi*Pi)*
-                                  ((this-> fOsFromMs2(mu, mMS, Nf-1)))/(Pi*Pi) +
-            asmu*asmu*asmu*asmu*(-564731./124416. + (2645.*lmm)/1728. + (167.*lmm*lmm)/576. + lmm*lmm*lmm/216. +
-   					(2633./31104. - (67.*lmm)/576. + lmm*lmm/36.)*(Nf-1) + (82043.*Zeta3)/27648.)/(Pi*Pi*Pi)
-                    *(this ->fOsFromMs1(mu, mMS))/(Pi) +
-            asmu*asmu*asmu*asmu*(lmm)/(6.*Pi)*(lmm)/(6.*Pi)*((this-> fOsFromMs2(mu, mMS, Nf-1)))/(Pi*Pi);
-
-     double erg=0.0;
-     if(nloop==0){
-       erg=1;
-     }
-     else{
-       for(int i=0; i<=nloop; i++){
-         erg+=sum[i];
-       }
-     }
-     return mMS*erg;
-}
-
-// Coefficients of eq.(16) of [RunDec]
-double CRunDec::fMumFromOs1(void){
-     return (double) -cf;
-}
-
-double CRunDec::fMumFromOs2(void){
-     double erg;
-     erg= (double) ((-1111.*ca*cf)/384. + (199.*cf*cf)/128. + (143.*cf*tr)/96. +
-     (71.*cf*(Nf-1)*tr)/96. + (ca*cf*Zeta2)/2. - (15.*cf*cf*Zeta2)/8. -
-     (3.*ca*cf*log(2)*Zeta2)/2. +
-     3.*cf*cf*log(2)*Zeta2 - cf*tr*Zeta2 + (cf*(Nf-1)*tr*Zeta2)/2. +
-     (3.*ca*cf*Zeta3)/8. -
-     (3.*cf*cf*Zeta3)/4.);
-     return erg;
-}
-
-// z_m^SI
-double CRunDec::fMumFromOs3(void){
-     double erg;
-     erg= (double) -7172965./93312. -
-	 (293.*(Nf-1))/216. - (618281.*Pi*Pi)/38880. - ((Nf-1)*Pi*Pi)/9. +
-     (695.*Pi*Pi*Pi*Pi)/7776. + (623.*Pi*Pi*log(2))/162. +
-     (22.*Pi*Pi*log(2)*log(2))/81. +
-     (55.*log(2)*log(2)*log(2)*log(2))/162. + (220.*A4)/27. +
-     (Nf-1)*(Nf-1)*(-2353./23328. - (13.*Pi*Pi)/324. - (7.*Zeta3)/54.) -
-     (70.*Zeta3)/27. +
-     (1439.*Pi*Pi*Zeta3)/432. + (Nf-1)*(246643./23328. + (967.*Pi*Pi)/648. -
-     (61.*Pi*Pi*Pi*Pi)/1944. + (11.*Pi*Pi*log(2))/81. -
-     (2*Pi*Pi*log(2)*log(2))/81. -
-     log(2)*log(2)*log(2)*log(2)/81. - (8.*A4)/27. + (241.*Zeta3)/72.) -
-     (1975.*Zeta5)/216.;
-     return erg;
-}
-
-double CRunDec::fMumFromOs4(double err){
-     double erg;
-     erg = err*(-3214.227044839041 + 692.4809215366435*(-1. + Nf) - 41.95978562498058*(-1. + Nf)*(-1. + Nf)
-                + 0.678141025604516*(-1. + Nf)*(-1. + Nf)*(-1. + Nf));
-     return erg;
-}
-
-// Function: double CRunDec::mOS2mSI(double mOS, std::pair<double,double>* mq, double asM,
-//                           int nl)
-double CRunDec::mOS2mSI(double mOS, std::pair<double,double>* mq, double asM, int nl, double fdelm){
-     if(nl<0||nl>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     if(nl == 4 && (Nf<4||Nf>6)){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR 4 LOOPS and "<< Nf << " FLAVORS"<<endl;
-       RETURN
-     }
-
-     double sum[5];
-     double deltalight = deltamOS2mMS(mOS, mq, asM/Pi, mOS, Nf-1, nl);
-     sum[0]=(double) 1.;
-     sum[1]=asM*(this ->fMumFromOs1())/Pi;
-     sum[2]=asM*asM*(this-> fMumFromOs2())/(Pi*Pi);
-     sum[3]=asM*asM*asM*(this-> fMumFromOs3())/(Pi*Pi*Pi);
-     sum[4]=asM*asM*asM*asM*(this->fMumFromOs4(fdelm))/(Pi*Pi*Pi*Pi);
-
-
-     double erg=0.0;
-     if(nl==0){
-       erg=1;
-     }
-     else{
-       for(int i=0; i<=nl; i++){
-         erg+=sum[i];
-       }
-     }
-     erg += deltalight;
-     return mOS*erg;
-
-}
-
-// Function: double CRunDec::mOS2mMSrun(double mOS, std::pair<double,double>* mq, double asmu,
-//                           double mu, int nl)
-double CRunDec::mOS2mMSrun(double mOS, std::pair<double,double>* mq, double asmu, double mu,
-			   int nl){
-     double asM=0.0;
-     asM= this-> AlphasExact(asmu, mu, mOS, nl);
-     double mum= this-> mOS2mSI(mOS, mq, asM, nl);
-     double asmum= this-> AlphasExact(asmu, mu, mum, nl);
-     double newM= this->mMS2mMS(mum, asmum, asmu, nl);
-     return newM;
-}
-
-// Function: double CRunDec::mMS2mOSrun(double mMS, std::pair<double,double>* mq, double asmu,
-//                           double mu, int nl)
-double CRunDec::mMS2mOSrun(double mMS, std::pair<double,double>* mq, double asmu, double mu,
-			   int nl){
-     double mNeu = mMS2mSI(mMS, asmu, mu, nl);
-     double asmNeu = AlphasExact(asmu, mu, mNeu, nl);
-     return mMS2mOS(mNeu, mq, asmNeu, mNeu, nl);
-}
-
-// Coefficients of eq.(19) of [RunDec]
-double CRunDec::fRiFromMs(double alpha, double nl){
-     double sum[4];
-     sum[0]= 1.;
-     sum[1]= (4.*alpha)/3.;
-     sum[2]= alpha*alpha*((1123./72. - (89.*Nf)/144. - (19.*Zeta3)/6.));
-     sum[3]= alpha*alpha*alpha*(6663911./41472. - (118325.*Nf)/7776. +
-            (4459.*Nf*Nf)/23328. +
-            (4.*(1123./72. - (89.*Nf)/144. - (19.*Zeta3)/6.))/3. -
-            (408007.*Zeta3)/6912. +
-            (617.*Nf*Zeta3)/216. + (Nf*Nf*Zeta3)/54. - (4.*(-995./72. +
-            (89.*Nf)/144. + (19.*Zeta3)/6.))/3. -
-            (5.*Nf*Zeta4)/12. + (185.*Zeta5)/36.);
-     double erg=0.0;
-     if(nl==0){
-       erg=1.;
-     }
-     else{
-       erg=0.;
-       for(int i=0; i<=nl; i++){
-         erg+=sum[i];
-       }
-     }
-     return (erg);
-}
-
-// Function: double CRunDec::mMS2mRI(double mMS, double asmu, int nl)
-double CRunDec::mMS2mRI(double mMS, double asmu, int nl){
-     if(nl<0||nl>3){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     return (double) mMS*(this->fRiFromMs((asmu/Pi), nl));
-}
-
-// Coefficients needed for the transformation of mOS to mMSit
-double CRunDec::fHelpmOS2mMSit(double mMS, double mOS, std::pair<double,double>* mq, double asmu,
-                                double mu, int nl){
-     double sum[4];
-     double deltalight = deltamMS2mOS(mMS,mq,asmu/Pi,mu,Nf-1,nl);
-     sum[0]=(double) 1.;
-     sum[1]=asmu*(this ->fOsFromMs1(mu, mMS))/Pi;
-     sum[2]=asmu*asmu*((this-> fOsFromMs2(mu, mMS, Nf-1)))/(Pi*Pi);
-     sum[3]=asmu*asmu*asmu*(this-> fOsFromMs3(mu, mMS,Nf-1)+
-           +this->fZmInvM(Nf-1))/(Pi*Pi*Pi);
-     double erg=0.0;
-     if(nl==0){
-       erg=1;
-     }
-     else{
-       for(int i=0; i<=nl; i++){
-         erg+=sum[i];
-       }
-     }
-     erg += deltalight;
-     return erg;
-}
-
-// Function: double CRunDec::mOS2mMSit(double mOS, std::pair<double,double>* mq, double asmu,
-//                          double mu, int nl)
-double CRunDec::mOS2mMSit(double mOS, std::pair<double,double>* mq, double asmu, double mu,
-                           int nl){
-     if(nl<0||nl>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     double epsilonX= 1e-8;
-     double x0=mOS-0.1*mOS;
-     double x1=mOS+0.1*mOS;
-     double f0= (x0*(this->fHelpmOS2mMSit(x0,mOS, mq, asmu, mu, nl))-mOS);
-     double f1= (x1*(this->fHelpmOS2mMSit(x1,mOS, mq, asmu, mu, nl))-mOS);
-     if(f0*f1>0){
-       cout<<"WARNING: No root can be calculatet!"<<endl;
-       RETURN
-     }
-     double xTest;
-     double fTest;
-     do{
-       xTest= (x0+x1)/2.;
-       fTest= (xTest*(this->fHelpmOS2mMSit(xTest,mOS, mq, asmu, mu, nl))-mOS);
-       if(f0*fTest<=0){x1= xTest;}
-       else {x0= xTest;}
-     }
-     while(abs(x1-x0)>= epsilonX);
-       double mNeu=xTest;
-     return mNeu;
-}
-
-double CRunDec::PSdelta(double asmu, double muf, double mu, int nl, int nloops) {
-     if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-     double lf = log(mu*mu/(muf*muf));
-     double api = asmu;
-     double ret[5];
-     ret[0] = 0.0;
-     ret[1] = api*4./3.;
-     ret[2] = api*api*(97./9. + nl*(-22./27. - (2.*lf)/9.) + (11.*lf)/3.);
-     ret[3] = api*api*api*(33623./216. + 3.*Pi*Pi - (3.*Pi*Pi*Pi*Pi)/16. + (610.*lf)/9.
-              + (121.*lf*lf)/12. + nl*nl*(157./243. + (22.*lf)/81. + lf*lf/27.) +
-              nl*(-7145./324. - (493.*lf)/54. - (11.*lf*lf)/9. - (13.*Zeta3)/9.) + (11.*Zeta3)/2.);
-     ret[4] = api*api*api*api*(3567.723056629293 + (7271.*lf*lf)/24. + (1331.*lf*lf*lf)/48.
-              + nl*nl*nl*(-2951./4374. - (157.*lf)/486. - (11.*lf*lf)/162. -
-              lf*lf*lf/162.) + nl*(-701.2303148875468 - (8485.*lf*lf)/144. - (121.*lf*lf*lf)/24.
-              + lf*(-253189./864. - (3.*Pi*Pi)/2. + (3.*Pi*Pi*Pi*Pi)/32.
-              - (44.*Zeta3)/3.)) + nl*nl*(1751971./46656. + Pi*Pi*Pi*Pi/135. + (773.*lf*lf)/216. +
-              (11.*lf*lf*lf)/36. + lf*(15355./864. + (13.*Zeta3)/18.) +
-              (259.*Zeta3)/108.) + lf*(26125./18. + (99.*Pi*Pi)/4. - (99.*Pi*Pi*Pi*Pi)/64. + (363.*Zeta3)/8.));
-
-     double delta = 0.0;
-     for(int i = 0; i <= nloops; i++) {
-       delta += ret[i];
-     }
-	 return delta;
-}
-
-// Function: double CRunDec::mOS2mPS(double mOS, std::pair<double,double>* mq, double asmu, double mu, double muf, int nl, int nloops)
-double CRunDec::mOS2mPS(double mOS, std::pair<double,double>* mq, double asmu, double mu, double muf, int nl, int nloops) {
-     if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-
-	 return mOS - muf*PSdelta(asmu/Pi, muf, mu, nl, nloops);
-}
-
-// Function: double CRunDec::mMS2mPS(double mMS, std::pair<double,double>* mq, double asmu,
-//                                   double mu, double muf, int nl, int nloops, double fdelm)
-double CRunDec::mMS2mPS(double mMS, std::pair<double,double>* mq, double asmu,
-                        double mu, double muf, int nl, int nloops, double fdelm) {
-     if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-
-     double delmuf = PSdelta(asmu/Pi, muf, mu, nl, nloops);
-     double exmOS = mMS2mOSmod(mMS, this->mq, asmu, mu, nl+1, nloops, fdelm);
-     return (exmOS - muf*delmuf);
-}
-
-// Function: double CRunDec::mPS2mMS(double mPS, std::pair<double,double>* mq, double asmu,
-//                                   double mu, double muf, int nl, int nloops, double fdelm)
-double CRunDec::mPS2mMS(double mPS, std::pair<double,double>* mq, double asmu,
-                        double mu, double muf, int nl, int nloops, double fdelm) {
-     if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-
-     double lowbound = mPS - mPS/4.;
-     double highbound = mPS + mPS/4.;
-     bool found = false;
-     double f1 = mMS2mPS(lowbound, mq, asmu, mu, muf, nl, nloops, fdelm) - mPS;
-     double f2 = mMS2mPS(highbound, mq, asmu, mu, muf, nl, nloops, fdelm) - mPS;
-     for(int j = 0; j < 1000; j++) {
-       if(f1*f2 < 0.0) {
-         found = true;
-         break;
-       }
-       if(fabs(f1) < fabs(f2)) {
-         lowbound  += 1.5*(lowbound - highbound);
-         if(lowbound < 0.0)
-            lowbound = 0.0;
-         f1 = mMS2mPS(lowbound, mq, asmu, mu, muf, nl, nloops, fdelm) - mPS;
-       } else {
-         highbound  -= 1.5*(lowbound - highbound);
-         f2 = mMS2mPS(highbound, mq, asmu, mu, muf, nl, nloops, fdelm) - mPS;
-       }
-     }
-     if(found) {
-     double acc = 10e-10;
-     double dx;
-     double xmid;
-     double mMS = f1 < 0.0 ? (dx=highbound-lowbound,lowbound) : (dx=lowbound-highbound,highbound);
-     for(int j = 0; j < 1000; j++) {
-       f2 = mMS2mPS(xmid = mMS+(dx *= 0.5), mq, asmu, mu, muf, nl, nloops, fdelm) - mPS;
-       if(f2 <= 0.0)
-         mMS = xmid;
-       if(fabs(dx) < acc || f2 == 0.0)
-         return mMS;
-     }
-     }
-     return 0.0;
-}
-
-// Function: double CRunDec::mPS2mSI(double mPS, std::pair<double,double>* mq,
-//                                   double (*as)(double), double muf, int nl, int nloops, double fdelm)
-// The function pointer passed should contain the adress of a function computing alpha_s in dependence of mu
-double CRunDec::mPS2mSI(double mPS, std::pair<double,double>* mq,
-                        double (*as)(double), double muf, int nl, int nloops, double fdelm) {
-    if(as == NULL) {
-      cout << "Pointer to as == NULL! Aborting..." << endl;
-      RETURN
-    }
-	double mMS1 = 0;
-	double mMS = mPS;
-	double acc = 10e-6;
-	while(fabs(mMS1 - mMS) > acc) {
-		mMS1 = mMS;
-        mMS = mPS2mMS(mPS, mq, as(mMS1), mMS1, muf, nl, nloops, fdelm);
-	}
-	return mMS;
-}
-
-
-double CRunDec::E1p(double mOS, double asmu, double mu, int nl, int nloops) {
-     if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-     double lmm = log(mu/mOS);
-     double lmm34 = log(3.*mu/(4.*asmu*mOS));
-     double api = asmu/(Pi);
-     double ret[5];
-
-     ret[0] = 0.0;
-     ret[1] = 1.0;
-     ret[2] = api*(97./6. + nl*(-11./9. - (2.*lmm34)/
-                 3.) + 11.*lmm34);
-     ret[3] = api*api*(1793./12. + (2917./216. - (11.*nl)/18. + nl*nl/54.)*Pi*Pi -
-              (9.*Pi*Pi*Pi*Pi)/32. + (927.*lmm34)/4. +
-              (363.*lmm34*lmm34)/4. + nl*(-1693./72. -
-                (193.*lmm34)/6. - 11.*lmm34*lmm34 - (19.*Zeta3)/2.) + nl*nl*(77./108. +
-                lmm34 + lmm34*lmm34/3. +
-                (2.*Zeta3)/9.) + (275.*Zeta3)/4.);
-     ret[4] = api*api*api*(1267919./1728. + Pi*Pi*Pi*Pi*(-723119./51840. + (11.*nl*nl)/
-                 1080. - nl*nl*nl/4860. + nl*(59677./77760. + (3.*lmm34)/8.) - (99.*lmm34)/16.) +
-              (4521.*lmm34*lmm34)/2. + (1331.*
-                lmm34*lmm34*lmm34)/2. + (114917.*Zeta3)/48. +
-              lmm34*(247675./96. + (3025.*Zeta3)/2.) +
-              Pi*Pi*(265.389067842508 + (865.*lmm)/18. +
-                (26897.*lmm34)/108. + nl*nl*(905./432. +
-                  (11.*lmm34)/9. - (11.*Zeta3)/6.) +
-                nl*nl*nl*(-19./486. - (2.*lmm34)/81. +
-                  Zeta3/27.) + nl*(-397591./7776. - (5095.*lmm34)/162. + (121.*Zeta3)/4.)) + (13432.614375 -
-                3289.906669391583*nl - (1000.*nl*nl*nl)/729. + nl*nl*
-                 ((14002./81. - (416.*Zeta3)/3.)/3. + (3.*(12541./243. + (64.*Pi*Pi*Pi*Pi)/
-                      135. + (368.*Zeta3)/3.))/4.))/32. + nl*(-52033./288. -
-                (10955.*lmm34*lmm34)/24. -
-                121.*lmm34*lmm34*lmm34 + lmm34*
-                 (-166309./288. - (902.*Zeta3)/3.) - (8797.*Zeta3)/18. -
-                363.*Zeta5) + nl*nl*nl*(-98./729. - (5.*lmm34*lmm34)/
-                 9. - (4.*lmm34*lmm34*lmm34)/27. +
-                lmm34*(-50./81. - (8.*Zeta3)/27.) -
-                (44.*Zeta3)/81. - (4.*Zeta5)/9.) + (3993.*Zeta5)/2. +
-              nl*nl*(3073./288. + (1027.*lmm34*lmm34)/36. +
-                (22.*lmm34*lmm34*lmm34)/3. + (3239.*Zeta3)/108. +
-                lmm34*(10351./288. + (158.*Zeta3)/9.) +
-                22.*Zeta5));
-
-
-     double E = 0.0;
-     for(int i = 0; i <= nloops; i++) {
-       E += ret[i];
-     }
-	 return -E*(4.*asmu*asmu*mOS)/9.;
-}
-
-// Function: double CRunDec::mOS2m1S(double mOS, std::pair<double,double>* mq,
-//                                   double asmu, double mu, int nl, int nloops)
-double CRunDec::mOS2m1S(double mOS, std::pair<double,double>* mq, double asmu, double mu, int nl, int nloops) {
-     if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-	 return mOS + 0.5*E1p(mOS, asmu, mu, nl, nloops);
-}
-
-// Function: double CRunDec::mMS2m1S(double mMS, std::pair<double,double>* mq,
-//                                   double asmu, double mu, int nl, int nloops, double fdelm)
-double CRunDec::mMS2m1S(double mMS, std::pair<double,double>* mq,
-                        double asmu, double mu, int nl, int nloops, double fdelm) {
-     if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-     if(nl<3||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR 4 LOOPS and " << nl << " FLAVORS"<<endl;
-       RETURN
-     }
-     double lmm = log(mu*mu/(mMS*mMS));
-     double log34 = log((3.*mu)/(4.*asmu*mMS));
-     double m1S = mMS;
-     switch(nloops) {
-       case 1: m1S += asmu*mMS*(12. - 2.*asmu*Pi + 9.*lmm)/(9.*Pi);
-               break;
-       case 2: m1S += asmu*mMS*(-(2.*asmu)/9. + asmu*asmu*(-291. + 22.*nl - 198.*log34 +
-                      12.*nl*log34 - 3.*(8. + 6.*lmm))/(81.*Pi) + (4. + 3.*lmm)/(3.*Pi) +
-                      (asmu*(2763. - 142.*nl + 96.*Pi*Pi - 16.*nl*Pi*Pi + 32.*Pi*Pi*ln2 +
-                      2036.*lmm - 104.*nl*lmm + 564.*lmm*lmm - 24.*nl*lmm*lmm - 48.*Zeta3))/(288.*Pi*Pi));
-               break;
-       case 3: m1S += asmu*mMS*(-(2.*asmu)/9. + asmu*asmu*(-291. + 22.*nl -  198.*log34 +
-                      12.*nl*log34)/(81.*Pi) + (4. + 3.*lmm)/(3.*Pi) - (2.*asmu*asmu*(4. + 3.*lmm))/(27.*Pi) +
-                      asmu*asmu*asmu*(-372. + 40.*nl - 792.*log34 +
-                      48.*nl*log34 - 279.*lmm + 30.*nl*lmm -
-                      594.*log34*lmm + 36.*nl*log34*lmm)/(243.*Pi*Pi)
-                      + (asmu*(2763. - 142.*nl + 96.*Pi*Pi - 16.*nl*Pi*Pi + 32.*Pi*Pi*ln2 + 2036.*lmm - 104.*nl*lmm +
-                      564.*lmm*lmm - 24.*nl*lmm*lmm - 48.*Zeta3))/(288.*Pi*Pi) + asmu*asmu*asmu*(-2763.+ 142.*nl -
-                      96.*Pi*Pi + 16.*nl*Pi*Pi - 32.*Pi*Pi*ln2 -
-                      2036.*lmm + 104.*nl*lmm - 564.*lmm*lmm +
-                      24.*nl*lmm*lmm + 48.*Zeta3)/(1296.*Pi*Pi)
-                      + asmu*asmu*asmu*(-129096. + 20316.*nl - 616.*nl*nl -
-                      11668.*Pi*Pi + 528.*nl*Pi*Pi - 16.*nl*nl*Pi*Pi + 243.*Pi*Pi*Pi*Pi -
-                      200232.*log34 + 27792.*nl*log34 - 864.*nl*nl*log34 -
-                      78408.*log34*log34 + 9504.*nl*log34*log34 -
-                      288.*nl*nl*log34*log34 - 59400.*Zeta3 + 8208.*nl*Zeta3 -
-                      192.*nl*nl*Zeta3)/(3888*Pi*Pi) +
-                      (asmu*asmu*(42314585. - 4636940.*nl + 47060.*nl*nl + 7834092.*Pi*Pi -
-                      713520.*nl*Pi*Pi + 18720.*nl*nl*Pi*Pi - 41700.*Pi*Pi*Pi*Pi + 14640.*nl*Pi*Pi*Pi*Pi -
-                      1656000.*Pi*Pi*ln2 - 63360.*nl*Pi*Pi*ln2 - 126720.*Pi*Pi*ln2*ln2 +
-                      11520.*nl*Pi*Pi*ln2*ln2 - 158400.*ln2*ln2*ln2*ln2 + 5760.*nl*ln2*ln2*ln2*ln2 +
-                      33620760.*lmm - 3723120.*nl*lmm + 64080.*nl*nl*lmm + 1010880.*Pi*Pi*lmm - 220320.*nl*Pi*Pi*lmm + 8640.*nl*nl*Pi*Pi*lmm +
-                      336960.*Pi*Pi*ln2*lmm - 17280.*nl*Pi*Pi*ln2*lmm + 11726100.*lmm*lmm - 1247400.*nl*lmm*lmm + 28080.*nl*nl*lmm*lmm +
-                      2009880.*lmm*lmm*lmm - 185760.*nl*lmm*lmm*lmm + 4320.*nl*nl*lmm*lmm*lmm - 3801600.*A4 + 138240.*nl*A4 + 1002240.*Zeta3 -
-                      1561680.*nl*Zeta3 + 60480.*nl*nl*Zeta3 - 1554120.*Pi*Pi*Zeta3 - 894240.*lmm*Zeta3 - 362880.*nl*lmm*Zeta3 + 4266000.*Zeta5))/
-                      (466560.*Pi*Pi*Pi));
-                      break;
-       case 4: m1S += - (2*asmu*asmu*mMS)/9 + (-291*asmu*asmu*asmu*mMS + 22*asmu*asmu*asmu*mMS*nl -
-                      198*asmu*asmu*asmu*mMS*log34 +
-                      12*asmu*asmu*asmu*mMS*nl*log34)/(81*Pi) +
-                      (asmu*mMS*(4 + 3*lmm))/(3*Pi) -
-                      (2*(4*asmu*asmu*asmu*mMS + 3*asmu*asmu*asmu*mMS*lmm))/(27*Pi) +
-                      (-372*asmu*asmu*asmu*asmu*mMS + 40*asmu*asmu*asmu*asmu*mMS*nl -
-                      792*asmu*asmu*asmu*asmu*mMS*log34 +
-                      48*asmu*asmu*asmu*asmu*mMS*nl*log34 -
-                      279*asmu*asmu*asmu*asmu*mMS*lmm + 30*asmu*asmu*asmu*asmu*mMS*nl*lmm -
-                      594*asmu*asmu*asmu*asmu*mMS*log34*lmm +
-                      36*asmu*asmu*asmu*asmu*mMS*nl*log34*lmm)/(243*Pi*Pi)
-                      + 1.5139171475883256E-8*(-3.6643425048120157E6*asmu*asmu*asmu*asmu*mMS -
-                      3.670703784417217E9*asmu*asmu*asmu*asmu*asmu*mMS + 292307.7010004199*asmu*asmu*asmu*asmu*mMS*nl +
-                      6.48095550442438E8*asmu*asmu*asmu*asmu*asmu*mMS*nl -
-                      3.6315792483681194E7*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl +
-                      595364.9557740748*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*nl -
-                      2.245324461595123E8*asmu*asmu*asmu*asmu*asmu*mMS*log(mu/mMS) -
-                      3.062101652047988E9*asmu*asmu*asmu*asmu*asmu*mMS*log34 +
-                      5.902121099662828E8*asmu*asmu*asmu*asmu*asmu*mMS*nl*log34 -
-                      3.325469404123189E7*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*log34 +
-                      576205.4055744545*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*nl*log34 -
-                      1.1274215864457371E9*asmu*asmu*asmu*asmu*asmu*mMS*log34*log34 +
-                      2.230344299450968E8*asmu*asmu*asmu*asmu*asmu*mMS*nl*log34*log34 -
-                      1.3715687063042711E7*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*log34*log34 +
-                      263004.5457918066*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*nl*log34*log34 -
-                      3.1505314540400505E8*asmu*asmu*asmu*asmu*asmu*mMS*log34*log34*log34 +
-                      5.728239007345548E7*asmu*asmu*asmu*asmu*asmu*mMS*nl*log34*log34*log34 -
-                      3.4716600044518467E6*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*log34*log34*log34 +
-                      70134.54554448176*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*nl*log34*log34*log34 +
-                      7.228435160639514E7*asmu*asmu*asmu*asmu*mMS*lmm -
-                      1.061086986213349E8*asmu*asmu*asmu*asmu*asmu*mMS*lmm -
-                      9.657775840868242E6*asmu*asmu*asmu*asmu*mMS*nl*lmm +
-                      1.3033590170779591E7*asmu*asmu*asmu*asmu*asmu*mMS*nl*lmm +
-                      221297.1713327142*asmu*asmu*asmu*asmu*mMS*nl*nl*lmm -
-                      323617.3768070282*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*lmm -
-                      6.0602822464077026E7*asmu*asmu*asmu*asmu*asmu*mMS*log34*
-                      lmm + 8.924620920535302E6*asmu*asmu*asmu*asmu*asmu*mMS*nl*log34*lmm -
-                      271771.36398486677*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*log34*
-                      lmm - 4.2961792555091605E7*asmu*asmu*asmu*asmu*asmu*mMS*log34*log34*lmm +
-                      5.20749000667777E6*asmu*asmu*asmu*asmu*asmu*mMS*nl*log34*log34*
-                      lmm - 157802.72747508393*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*log34*log34*lmm +
-                      3.6846948160874695E7*asmu*asmu*asmu*asmu*mMS*lmm*lmm -
-                      1.4084441353288308E7*asmu*asmu*asmu*asmu*asmu*mMS*lmm*lmm -
-                      4.890850849173104E6*asmu*asmu*asmu*asmu*mMS*nl*lmm*lmm +
-                      1.826785740978923E6*asmu*asmu*asmu*asmu*asmu*mMS*nl*lmm*lmm +
-                      108536.53795824476*asmu*asmu*asmu*asmu*mMS*nl*nl*lmm*lmm -
-                      50409.20461009625*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*lmm*lmm -
-                      1.0198001263077298E7*asmu*asmu*asmu*asmu*asmu*mMS*log34*
-                      lmm*lmm + 1.0520181831672261E6*asmu*asmu*asmu*asmu*asmu*mMS*nl*log34*lmm*lmm -
-                      26300.454579180656*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*log34*
-                      lmm*lmm + 9.281070040868293E6*asmu*asmu*asmu*asmu*mMS*
-                      lmm*lmm*lmm - 2.039381082160633E6*asmu*asmu*asmu*asmu*asmu*mMS*
-                      lmm*lmm*lmm - 919055.1091884745*asmu*asmu*asmu*asmu*mMS*nl*
-                      lmm*lmm*lmm + 188486.5911507947*asmu*asmu*asmu*asmu*asmu*mMS*nl*
-                      lmm*lmm*lmm + 20406.00584022232*asmu*asmu*asmu*asmu*mMS*nl*nl*
-                      lmm*lmm*lmm - 4383.409096530109*asmu*asmu*asmu*asmu*asmu*mMS*nl*nl*
-                      lmm*lmm*lmm + 1.3530751564824337E6*asmu*asmu*asmu*asmu*mMS*
-                      lmm*lmm*lmm*lmm - 130284.49882603479*asmu*asmu*asmu*asmu*mMS*nl*
-                      lmm*lmm*lmm*lmm + 3139.3855138803565*asmu*asmu*asmu*asmu*mMS*nl*nl*
-                      lmm*lmm*lmm*lmm + 678107.270998157*asmu*asmu*asmu*asmu*mMS*
-                      this->fOsFromMs4(mu,mMS,nl,fdelm)) +
-                      (asmu*asmu*mMS*(2763 - 142*nl + 96*Pi*Pi - 16*nl*Pi*Pi + 32*Pi*Pi*ln2 +
-                      2036*lmm - 104*nl*lmm + 564*lmm*lmm - 24*nl*lmm*lmm - 48*Zeta3))/
-                      (288*Pi*Pi) + (-2763*asmu*asmu*asmu*asmu*mMS + 142*asmu*asmu*asmu*asmu*mMS*nl -
-                      96*asmu*asmu*asmu*asmu*mMS*Pi*Pi + 16*asmu*asmu*asmu*asmu*mMS*nl*Pi*Pi -
-                      32*asmu*asmu*asmu*asmu*mMS*Pi*Pi*ln2 - 2036*asmu*asmu*asmu*asmu*mMS*lmm +
-                      104*asmu*asmu*asmu*asmu*mMS*nl*lmm - 564*asmu*asmu*asmu*asmu*mMS*lmm*lmm +
-                      24*asmu*asmu*asmu*asmu*mMS*nl*lmm*lmm + 48*asmu*asmu*asmu*asmu*mMS*Zeta3)/(1296*Pi*Pi)
-                      + (-129096*asmu*asmu*asmu*asmu*mMS + 20316*asmu*asmu*asmu*asmu*mMS*nl - 616*asmu*asmu*asmu*asmu*mMS*nl*nl -
-                      11668*asmu*asmu*asmu*asmu*mMS*Pi*Pi + 528*asmu*asmu*asmu*asmu*mMS*nl*Pi*Pi -
-                      16*asmu*asmu*asmu*asmu*mMS*nl*nl*Pi*Pi + 243*asmu*asmu*asmu*asmu*mMS*Pi*Pi*Pi*Pi -
-                      200232*asmu*asmu*asmu*asmu*mMS*log34 +
-                      27792*asmu*asmu*asmu*asmu*mMS*nl*log34 -
-                      864*asmu*asmu*asmu*asmu*mMS*nl*nl*log34 -
-                      78408*asmu*asmu*asmu*asmu*mMS*log34*log34 +
-                      9504*asmu*asmu*asmu*asmu*mMS*nl*log34*log34 -
-                      288*asmu*asmu*asmu*asmu*mMS*nl*nl*log34*log34 -
-                      59400*asmu*asmu*asmu*asmu*mMS*Zeta3 + 8208*asmu*asmu*asmu*asmu*mMS*nl*Zeta3 -
-                      192*asmu*asmu*asmu*asmu*mMS*nl*nl*Zeta3)/(3888*Pi*Pi) +
-                      (asmu*asmu*asmu*mMS*(42314585 - 4636940*nl + 47060*nl*nl + 7834092*Pi*Pi -
-                      713520*nl*Pi*Pi + 18720*nl*nl*Pi*Pi - 41700*Pi*Pi*Pi*Pi + 14640*nl*Pi*Pi*Pi*Pi -
-                      1656000*Pi*Pi*ln2 - 63360*nl*Pi*Pi*ln2 - 126720*Pi*Pi*ln2*ln2 +
-                      11520*nl*Pi*Pi*ln2*ln2 - 158400*ln2*ln2*ln2*ln2 + 5760*nl*ln2*ln2*ln2*ln2 +
-                      33620760*lmm - 3723120*nl*lmm +
-                      64080*nl*nl*lmm + 1010880*Pi*Pi*lmm -
-                      220320*nl*Pi*Pi*lmm + 8640*nl*nl*Pi*Pi*lmm +
-                      336960*Pi*Pi*ln2*lmm -
-                      17280*nl*Pi*Pi*ln2*lmm + 11726100*lmm*lmm -
-                      1247400*nl*lmm*lmm + 28080*nl*nl*lmm*lmm +
-                      2009880*lmm*lmm*lmm - 185760*nl*lmm*lmm*lmm +
-                      4320*nl*nl*lmm*lmm*lmm - 3801600*A4 +
-                      138240*nl*A4 + 1002240*Zeta3 - 1561680*nl*Zeta3 +
-                      60480*nl*nl*Zeta3 - 1554120*Pi*Pi*Zeta3 -
-                      894240*lmm*Zeta3 - 362880*nl*lmm*Zeta3 +
-                      4266000*Zeta5))/(466560*Pi*Pi*Pi);
-                      break;
-     }
-
-
-
-     return m1S;
-}
-
-// Function: double CRunDec::m1S2mMS(double m1S, std::pair<double,double>* mq,
-//                                   double asmu, double mu, int nl, int nloops, double fdelm)
-double CRunDec::m1S2mMS(double m1S, std::pair<double,double>* mq,
-                        double asmu, double mu, int nl, int nloops, double fdelm) {
-     if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-
-     double lowbound = m1S - m1S/5.;
-     double highbound = m1S + m1S/5.;
-     bool found = false;
-     double f1 = mMS2m1S(lowbound, mq, asmu, mu, nl, nloops, fdelm) - m1S;
-     double f2 = mMS2m1S(highbound,mq, asmu, mu, nl, nloops, fdelm) - m1S;
-     for(int j = 0; j < 1000; j++) {
-       if(f1*f2 < 0.0) {
-         found = true;
-         break;
-       }
-       if(fabs(f1) < fabs(f2))
-         f1 = mMS2m1S(lowbound += 1.5*(lowbound - highbound), mq, asmu, mu, nl, nloops, fdelm) - m1S;
-       else
-         f2 = mMS2m1S(highbound -= 1.5*(lowbound - highbound), mq, asmu, mu, nl, nloops, fdelm) - m1S;
-     }
-     if(found) {
-     double acc = 10e-10;
-     double dx;
-     double xmid;
-     double mMS = f1 < 0.0 ? (dx=highbound-lowbound,lowbound) : (dx=lowbound-highbound,highbound);
-     for(int j = 0; j < 1000; j++) {
-       f2 = mMS2m1S(xmid = mMS+(dx *= 0.5), mq, asmu, mu, nl, nloops, fdelm) - m1S;
-       if(f2 <= 0.0)
-         mMS = xmid;
-       if(fabs(dx) < acc || f2 == 0.0)
-         return mMS;
-     }
-     }
-     return 0.0;
-}
-
-// Function: double CRunDec::m1S2mSI(double m1S, std::pair<double,double>* mq,
-//                                   double (*as)(double), int nl, int nloops, double fdelm)
-// The function pointer passed should contain the adress of a function computing alpha_s in dependence of mu
-double CRunDec::m1S2mSI(double m1S, std::pair<double,double>* mq,
-                        double (*as)(double), int nl, int nloops, double fdelm) {
-    if(as == NULL) {
-      cout << "Pointer to as == NULL! Aborting..." << endl;
-      RETURN
-    }
-	double mMS1 = 0;
-	double mMS = m1S;
-	double acc = 10e-6;
-	while(fabs(mMS1 - mMS) > acc) {
-		mMS1 = mMS;
-        mMS = m1S2mMS(m1S, mq, as(mMS1), mMS1, nl, nloops, fdelm);
-	}
-	return mMS;
-}
-
-double CRunDec::exOS2RS(double api, double mmu, double nnuf, int nnl, int nloops) {
-	if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-     double lmm = log(mmu*mmu/(nnuf*nnuf));
-     double ret[5];
-     double Nm[] = {1.0, 1.0, 1.0, 0.563, 0.547, 0.527};
-     double nu[] = {1.0, 1.0, 1.0, 0.3951, 0.3696, 0.3289};
-     double ctil[4][6];
-     ctil[1][3] = -0.1638;
-     ctil[1][4] = -0.1054;
-     ctil[1][5] = 0.0238;
-     ctil[2][3] = 0.2372;
-     ctil[2][4] = 0.2736;
-     ctil[2][5] = 0.3265;
-     ctil[3][3] = -0.1205;
-     ctil[3][4] = -0.161;
-     ctil[3][5] = -0.2681;
-     ctil[0][0] = 1;
-     ctil[0][1] = 1;
-     ctil[0][2] = 1;
-     ctil[0][3] = 1;
-     ctil[0][4] = 1;
-     ctil[0][5] = 1;
-
-
-     ret[0] = 0.0;
-     ret[1] = api*nnuf*Pi*(1. + ctil[1][nnl] + ctil[2][nnl] + ctil[3][nnl])*Nm[nnl];
-     ret[2] = api*api*(((11. - (2.*nnl)/3.)*nnuf*Pi*((ctil[3][nnl]*tgamma(-1. + nu[nnl]))/
-           tgamma(-2. + nu[nnl]) + (ctil[2][nnl]*tgamma(nu[nnl]))/
-           tgamma(-1. + nu[nnl]) + (ctil[1][nnl]*tgamma(1. + nu[nnl]))/
-           tgamma(nu[nnl]) + tgamma(2. + nu[nnl])/tgamma(1. + nu[nnl]))*Nm[nnl])/
-        2. - (nnuf*Pi*(1. + ctil[1][nnl] + ctil[2][nnl] + ctil[3][nnl])*
-         (-33.*lmm + 2.*nnl*lmm)*Nm[nnl])/12.);
-
-     ret[3] = api*api*api*(((11. - (2.*nnl)/3.)*(11. - (2.*nnl)/3.)*nnuf*Pi*((ctil[3][nnl]*tgamma(nu[nnl]))/
-           tgamma(-2. + nu[nnl]) + (ctil[2][nnl]*tgamma(1. + nu[nnl]))/
-           tgamma(-1. + nu[nnl]) + (ctil[1][nnl]*tgamma(2. + nu[nnl]))/
-           tgamma(nu[nnl]) + tgamma(3. + nu[nnl])/tgamma(1. + nu[nnl]))*Nm[nnl])/
-        4. + nnuf*Pi*(1. + ctil[1][nnl] + ctil[2][nnl] + ctil[3][nnl])*
-        lmm*((102. - (38.*nnl)/3.)/16. +
-         ((11. - (2.*nnl)/3.)*(11. - (2.*nnl)/3.)*lmm)/16.)*Nm[nnl] +
-       ((11. - (2.*nnl)/3.)*nnuf*Pi*((ctil[3][nnl]*tgamma(-1. + nu[nnl]))/
-           tgamma(-2. + nu[nnl]) + (ctil[2][nnl]*tgamma(nu[nnl]))/
-           tgamma(-1. + nu[nnl]) + (ctil[1][nnl]*tgamma(1. + nu[nnl]))/
-           tgamma(nu[nnl]) + tgamma(2. + nu[nnl])/tgamma(1. + nu[nnl]))*
-         ((11.*lmm)/2. - (nnl*lmm)/3.)*Nm[nnl])/2.);
-
-     ret[4] = api*api*api*api*(((11. - (2.*nnl)/3.)*(11. - (2.*nnl)/3.)*(11. - (2.*nnl)/3.)*nnuf*Pi*((ctil[3][nnl]*tgamma(1. + nu[nnl]))/
-           tgamma(-2. + nu[nnl]) + (ctil[2][nnl]*tgamma(2. + nu[nnl]))/
-           tgamma(-1. + nu[nnl]) + (ctil[1][nnl]*tgamma(3. + nu[nnl]))/
-           tgamma(nu[nnl]) + tgamma(4. + nu[nnl])/tgamma(1. + nu[nnl]))*Nm[nnl])/
-        8. + ((11. - (2.*nnl)/3.)*(11. - (2.*nnl)/3.)*nnuf*Pi*((ctil[3][nnl]*tgamma(nu[nnl]))/
-           tgamma(-2. + nu[nnl]) + (ctil[2][nnl]*tgamma(1. + nu[nnl]))/
-           tgamma(-1. + nu[nnl]) + (ctil[1][nnl]*tgamma(2. + nu[nnl]))/
-           tgamma(nu[nnl]) + tgamma(3. + nu[nnl])/tgamma(1. + nu[nnl]))*
-         ((33.*lmm)/4. - (nnl*lmm)/2.)*Nm[nnl])/4. +
-       nnuf*Pi*(1. + ctil[1][nnl] + ctil[2][nnl] + ctil[3][nnl])*
-        lmm*((2857./2. - (5033.*nnl)/18. + (325.*nnl*nnl)/54.)/64. +
-         (5.*(102. - (38.*nnl)/3.)*(11. - (2.*nnl)/3.)*lmm)/128. +
-         ((11. - (2.*nnl)/3.)*(11. - (2.*nnl)/3.)*(11. - (2.*nnl)/3.)*lmm*lmm)/64.)*Nm[nnl] +
-       ((11. - (2.*nnl)/3.)*nnuf*Pi*((ctil[3][nnl]*tgamma(-1. + nu[nnl]))/
-           tgamma(-2. + nu[nnl]) + (ctil[2][nnl]*tgamma(nu[nnl]))/
-           tgamma(-1. + nu[nnl]) + (ctil[1][nnl]*tgamma(1. + nu[nnl]))/
-           tgamma(nu[nnl]) + tgamma(2. + nu[nnl])/tgamma(1. + nu[nnl]))*
-         (612.*lmm - 76.*nnl*lmm +
-          1089.*lmm*lmm - 132.*nnl*lmm*lmm +
-          4.*nnl*nnl*lmm*lmm)*Nm[nnl])/96.);
-
-
-     double res = 0.0;
-     for(int i = 0; i <= nloops; i++) {
-       res += ret[i];
-     }
-	 return res;
-}
-
-double CRunDec::exOS2RSp(double api, double mmu, double nnuf, int nnl, int nloops) {
-	if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-     double lmm = log(mmu*mmu/(nnuf*nnuf));
-     double ret[5];
-     double Nm[] = {1.0, 1.0, 1.0, 0.563, 0.547, 0.527};
-     double nu[] = {1.0, 1.0, 1.0, 0.3951, 0.3696, 0.3289};
-     double ctil[4][6];
-     ctil[1][3] = -0.1638;
-     ctil[1][4] = -0.1054;
-     ctil[1][5] = 0.0238;
-     ctil[2][3] = 0.2372;
-     ctil[2][4] = 0.2736;
-     ctil[2][5] = 0.3265;
-     ctil[3][3] = -0.1205;
-     ctil[3][4] = -0.161;
-     ctil[3][5] = -0.2681;
-     ctil[0][0] = 1;
-     ctil[0][1] = 1;
-     ctil[0][2] = 1;
-     ctil[0][3] = 1;
-     ctil[0][4] = 1;
-     ctil[0][5] = 1;
-
-
-     ret[0] = 0.0;
-     ret[1] = 0.0;
-     ret[2] = api*api*((11. - (2.*nnl)/3.)*nnuf*Pi*((ctil[3][nnl]*tgamma(-1. + nu[nnl]))/
-         tgamma(-2. + nu[nnl]) + (ctil[2][nnl]*tgamma(nu[nnl]))/
-         tgamma(-1. + nu[nnl]) + (ctil[1][nnl]*tgamma(1. + nu[nnl]))/
-         tgamma(nu[nnl]) + tgamma(2. + nu[nnl])/tgamma(1. + nu[nnl]))*Nm[nnl])/2.;
-
-     ret[3] = api*api*api*(((11. - (2.*nnl)/3.)*(11. - (2.*nnl)/3.)*nnuf*Pi*((ctil[3][nnl]*tgamma(nu[nnl]))/
-           tgamma(-2. + nu[nnl]) + (ctil[2][nnl]*tgamma(1. + nu[nnl]))/
-           tgamma(-1. + nu[nnl]) + (ctil[1][nnl]*tgamma(2. + nu[nnl]))/
-           tgamma(nu[nnl]) + tgamma(3. + nu[nnl])/tgamma(1. + nu[nnl]))*Nm[nnl])/
-        4. + ((11. - (2.*nnl)/3.)*nnuf*Pi*((ctil[3][nnl]*tgamma(-1. + nu[nnl]))/
-           tgamma(-2. + nu[nnl]) + (ctil[2][nnl]*tgamma(nu[nnl]))/
-           tgamma(-1. + nu[nnl]) + (ctil[1][nnl]*tgamma(1. + nu[nnl]))/
-           tgamma(nu[nnl]) + tgamma(2. + nu[nnl])/tgamma(1. + nu[nnl]))*
-         ((11.*lmm)/2. - (nnl*lmm)/3.)*Nm[nnl])/2.);
-
-     ret[4] = api*api*api*api*(((11. - (2.*nnl)/3.)*(11. - (2.*nnl)/3.)*(11. - (2.*nnl)/3.)*nnuf*Pi*((ctil[3][nnl]*tgamma(1. + nu[nnl]))/
-           tgamma(-2. + nu[nnl]) + (ctil[2][nnl]*tgamma(2. + nu[nnl]))/
-           tgamma(-1. + nu[nnl]) + (ctil[1][nnl]*tgamma(3. + nu[nnl]))/
-           tgamma(nu[nnl]) + tgamma(4. + nu[nnl])/tgamma(1. + nu[nnl]))*Nm[nnl])/
-        8. + ((11. - (2.*nnl)/3.)*(11. - (2.*nnl)/3.)*nnuf*Pi*((ctil[3][nnl]*tgamma(nu[nnl]))/
-           tgamma(-2. + nu[nnl]) + (ctil[2][nnl]*tgamma(1. + nu[nnl]))/
-           tgamma(-1. + nu[nnl]) + (ctil[1][nnl]*tgamma(2. + nu[nnl]))/
-           tgamma(nu[nnl]) + tgamma(3. + nu[nnl])/tgamma(1. + nu[nnl]))*
-         ((33.*lmm)/4. - (nnl*lmm)/2.)*Nm[nnl])/4. +
-       ((11. - (2.*nnl)/3.)*nnuf*Pi*((ctil[3][nnl]*tgamma(-1. + nu[nnl]))/
-           tgamma(-2. + nu[nnl]) + (ctil[2][nnl]*tgamma(nu[nnl]))/
-           tgamma(-1. + nu[nnl]) + (ctil[1][nnl]*tgamma(1. + nu[nnl]))/
-           tgamma(nu[nnl]) + tgamma(2. + nu[nnl])/tgamma(1. + nu[nnl]))*
-         (612.*lmm - 76.*nnl*lmm +
-          1089.*lmm*lmm - 132.*nnl*lmm*lmm +
-          4.*nnl*nnl*lmm*lmm)*Nm[nnl])/96.);
-
-     double res = 0.0;
-     for(int i = 0; i <= nloops; i++) {
-       res += ret[i];
-     }
-	 return res;
-}
-
-// Function: CRunDec::mOS2mRS(double mOS, std::pair<double,double>* mq, double asmu,
-//                            double mu, double nuf, int nl, int nloops, bool prime)
-double CRunDec::mOS2mRS(double mOS, std::pair<double,double>* mq, double asmu,
-                        double mu, double nuf, int nl, int nloops, bool prime) {
-     if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-     if(prime) {
-	   return mOS - exOS2RSp(asmu/Pi, mu, nuf, nl, nloops);
-     } else {
-	   return mOS - exOS2RS(asmu/Pi, mu, nuf, nl, nloops);
-     }
-}
-
-// Function: double CRunDec::mMS2mRS(double mMS, std::pair<double,double>* mq, double asmu,
-//                                   double mu, double nuf, int nl, int nloops, double fdelm, bool prime)
-double CRunDec::mMS2mRS(double mMS, std::pair<double,double>* mq, double asmu,
-                        double mu, double nuf, int nl, int nloops, double fdelm, bool prime) {
-     if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-     if(prime) {
-	   return mMS2mOSmod(mMS, mq, asmu, mu, nl+1, nloops, fdelm) - exOS2RSp(asmu/Pi, mu, nuf, nl, nloops);
-     } else {
-	   return mMS2mOSmod(mMS, mq, asmu, mu, nl+1, nloops, fdelm) - exOS2RS(asmu/Pi, mu, nuf, nl, nloops);
-     }
-}
-
-// Function: double CRunDec::mRS2mMS(double mRS, std::pair<double,double>* mq, double asmu,
-//                                   double mu, double muf, int nl, int nloops, double fdelm, bool prime)
-double CRunDec::mRS2mMS(double mRS, std::pair<double,double>* mq, double asmu,
-                        double mu, double muf, int nl, int nloops, double fdelm, bool prime) {
-     if(nloops<0||nloops>4){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
-       RETURN
-     }
-
-     double lowbound = mRS - mRS/5.;
-     double highbound = mRS + mRS/5.;
-     bool found = false;
-     double f1 = mMS2mRS(lowbound, mq, asmu, mu, muf, nl, nloops, fdelm, prime) - mRS;
-     double f2 = mMS2mRS(highbound, mq, asmu, mu, muf, nl, nloops, fdelm, prime) - mRS;
-     for(int j = 0; j < 1000; j++) {
-       if(f1*f2 < 0.0) {
-         found = true;
-         break;
-       }
-       if(fabs(f1) < fabs(f2))
-         f1 = mMS2mRS(lowbound += 1.5*(lowbound - highbound), mq, asmu, mu, muf, nl, nloops, fdelm, prime) - mRS;
-       else
-         f2 = mMS2mRS(highbound -= 1.5*(lowbound - highbound), mq, asmu, mu, muf, nl, nloops, fdelm, prime) - mRS;
-     }
-     if(found) {
-     double acc = 10e-10;
-     double dx;
-     double xmid;
-     double mMS = f1 < 0.0 ? (dx=highbound-lowbound,lowbound) : (dx=lowbound-highbound,highbound);
-     for(int j = 0; j < 1000; j++) {
-       f2 = mMS2mRS(xmid = mMS+(dx *= 0.5), mq, asmu, mu, muf, nl, nloops, fdelm, prime) - mRS;
-       if(f2 <= 0.0)
-         mMS = xmid;
-       if(fabs(dx) < acc || f2 == 0.0)
-         return mMS;
-     }
-     }
-     return 0.0;
-}
-
-// Function: double CRunDec::mRS2mSI(double mRS, std::pair<double,double>* mq, double (*as)(double),
-//                                   double muf, int nl, int nloops, double fdelm, bool prime)
-// The function pointer passed should contain the adress of a function computing alpha_s in dependence of mu
-double CRunDec::mRS2mSI(double mRS, std::pair<double,double>* mq, double (*as)(double),
-                        double muf, int nl, int nloops, double fdelm, bool prime) {
-    if(as == NULL) {
-      cout << "Pointer to as == NULL! Aborting..." << endl;
-      RETURN
-    }
-	double mMS1 = 0;
-	double mMS = mRS;
-	double acc = 10e-6;
-	while(fabs(mMS1 - mMS) > acc) {
-		mMS1 = mMS;
-        mMS = mRS2mMS(mRS, mq, as(mMS1), mMS1, muf, nl, nloops, fdelm, prime);
-	}
-	return mMS;
-}
-
-// Function: double CRunDec::mMS2mRGImod(double mMS, double asmu, int nl)
-// See 'mMS2mRGI' but 'Alphas/Pi -> AlphaS*2*Beta0/Pi'
-double CRunDec::mMS2mRGImod(double mMS, double asmu, int nl){
-     if(nl<0||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     if(nl==0){
-       return (double) mMS;
-     }
-     double bet0= 11./4. - Nf/6.;
-     double cAsmu= this->fSetcx((2*bet0*asmu)/Pi, nl);
-     return (double) mMS/cAsmu;
-}
-
-// Coefficients of eq.(22) of [RunDec]
-double CRunDec::fas5to6os(double A, double mass, double mu, double nlq, double nl){
-     double lmM  = log((mu*mu)/(mass*mass));
-     if(nl==1){
-       return 1;
-     }
-     double sum[5];
-     sum[0]=1.;
-     sum[1]=A*(-lmM)/6.;
-     sum[2]=A*A*(-7./24. - (19.*lmM)/24. + (lmM*lmM)/36.);
-     sum[3]=A*A*A*(-58933./124416. - (8521.*lmM)/1728. - (131.*lmM*lmM)/576. -
-                     (lmM*lmM*lmM)/216. +
-       nlq*(2479./31104. + (409.*lmM)/1728. + Zeta2/9.) - (2.*Zeta2)/3. -
-       (2.*Zeta2*log(2))/9. -
-       (80507.*Zeta3)/27648.);
-     sum[4]=
-       A*A*A*A*(-141841753./24494400. -
-       (7693.*lmM*lmM)/1152. - (8371.*lmM*lmM*lmM)/10368. + lmM*lmM*lmM*lmM/1296. -
-       (644201.*Pi*Pi)/116640. - (71102219.*Pi*Pi*Pi*Pi)/195955200. - (49.*Zeta2)/18. -
-       (49*log(2)*Zeta2)/54 + (49*Zeta3)/216 + (587*Pi*Pi*log(2))/486 +
-       (9318467*Pi*Pi*Pi*Pi*log(2))/32659200 - (2913037*Pi*Pi*log(2)*log(2))/1306368 +
-       (340853*Pi*Pi*log(2)*log(2)*log(2))/816480 + (3179149*log(2)*log(2)*log(2)*log(2))/1306368 -
-       (340853*log(2)*log(2)*log(2)*log(2)*log(2))/1360800 + (3179149*A4)/54432 +
-       (340853*A5)/11340 + lmM*(-19696909./746496. - (29*Zeta2)/9 -
-         (29*log(2)*Zeta2)/27 + (59*Zeta3)/108 - (2529743*Zeta3)/165888) +
-       nlq*nlq*(-140825./1492992. - (493*lmM*lmM)/20736 - (13*Pi*Pi)/972 +
-         lmM*(-1679./186624. - Zeta2/27) - (19*Zeta3)/1728) -
-       (2428169183*Zeta3)/87091200 + (1439*Pi*Pi*Zeta3)/1296 +
-       nlq*(1773073./746496. + (6661*lmM*lmM)/10368 + (107*lmM*lmM*lmM)/1728 +
-         (967*Pi*Pi)/1944 - (697709*Pi*Pi*Pi*Pi)/14929920 + (49*Zeta2)/108 +
-         (11*Pi*Pi*log(2))/243 - (1709*Pi*Pi*log(2)*log(2))/124416 +
-         (173*log(2)*log(2)*log(2)*log(2))/124416 + (173*A4)/5184 +
-         (4756441*Zeta3)/995328 + lmM*(1110443./373248. + (41*Zeta2)/54 +
-           (2*log(2)*Zeta2)/27 + (7*Zeta3)/27 + (110779*Zeta3)/82944) +
-         (115*Zeta5)/576) - (40596749*Zeta5)/1451520);
-
-     double erg=0.0;
-     for(int i=1;i<=nl;i++){
-       erg+=sum[i-1];
-     }
-     return erg;
-}
-
-// Function double CRunDec::DecAsDownOS(double als, double massth, double muth,
-//                          int nl)
-double CRunDec::DecAsDownOS(double als, double massth, double muth, int nl){
-       if(nl<1||nl>5){
-         cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl <<" LOOPS"<<endl;
-         RETURN
-       }
-       double erg=(this->fas5to6os(als/Pi, massth, muth, Nf,nl));
-       return als*erg;
-}
-
-// Coefficients of eq.(25) of [RunDec]
-double CRunDec::fas6to5os(double A, double mass, double mu, double nlq, double nl){
-     double lmM=log((mu*mu)/(mass*mass));
-     if(nl==1){
-       return 1;
-     }
-     double sum[5];
-     sum[0]=1.;
-     sum[1]=A*(lmM)/6.;
-     sum[2]=A*A*(7./24. + (19.*lmM)/24. + (lmM*lmM)/36.);
-     sum[3]=A*A*A*(58933./124416. + (2.*Zeta2)/3. + (2.*Zeta2*log(2))/9. +
-                    (80507.*Zeta3)/27648. + (8941.*lmM)/1728. +
-                    (511.*lmM*lmM)/576. + (lmM*lmM*lmM)/216. +
-                    nlq*(-2479./31104. - Zeta2/9. - (409.*lmM)/1728));
-     sum[4]=A*A*A*A*
-       (2313952./382725. + (47039.*lmM*lmM)/3456. + (14149.*lmM*lmM*lmM)/10368. +
-       lmM*lmM*lmM*lmM/1296. + (644201.*Pi*Pi)/116640. + (71102219.*Pi*Pi*Pi*Pi)/195955200. +
-       (49.*Zeta2)/18. + (49.*log(2)*Zeta2)/54. - (49.*Zeta3)/216. - (587.*Pi*Pi*log(2))/486. -
-       (9318467.*Pi*Pi*Pi*Pi*log(2))/32659200. + (2913037.*Pi*Pi*log(2)*log(2))/1306368. -
-       (340853.*Pi*Pi*log(2)*log(2)*log(2))/816480. - (3179149.*log(2)*log(2)*log(2)*log(2))/1306368. +
-       (340853.*log(2)*log(2)*log(2)*log(2)*log(2))/1360800. - (3179149.*A4)/54432. -
-       (340853.*A5)/11340. + nlq*nlq*(140825./1492992. +
-         (493.*lmM*lmM)/20736. + (13.*Pi*Pi)/972. + lmM*(1679./186624. + Zeta2/27.) +
-         (19.*Zeta3)/1728.) + (2428169183.*Zeta3)/87091200. -
-       (1439.*Pi*Pi*Zeta3)/1296. + lmM*(21084715./746496. + (35.*Zeta2)/9. +
-         (35.*log(2)*Zeta2)/27. - (65.*Zeta3)/108. + (3022001.*Zeta3)/165888.) +
-       nlq*(-1773073./746496. - (9115.*lmM*lmM)/10368. - (107.*lmM*lmM*lmM)/1728. -
-         (967.*Pi*Pi)/1944. + (697709.*Pi*Pi*Pi*Pi)/14929920. - (49.*Zeta2)/108. -
-         (11.*Pi*Pi*log(2))/243. + (1709.*Pi*Pi*log(2)*log(2))/124416. -
-         (173.*log(2)*log(2)*log(2)*log(2))/124416. - (173.*A4)/5184. +
-         lmM*(-1140191./373248. - (47.*Zeta2)/54. - (2.*log(2)*Zeta2)/27. - (7.*Zeta3)/27. -
-           (110779.*Zeta3)/82944.) - (4756441.*Zeta3)/995328. -
-         (115.*Zeta5)/576.) + (40596749.*Zeta5)/1451520.);
-
-     double erg=0.0;
-     for(int i=1;i<=nl;i++){
-       erg+=sum[i-1];
-     }
-     return erg;
-}
-
-// Function double CRunDec::DecAsUpOS(double als, double massth, double muth,
-//                          int nl)
-double CRunDec::DecAsUpOS(double als, double massth, double muth, int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl <<" LOOPS"<<endl;
-       RETURN
-     }
-     double erg=(this->fas6to5os(als/Pi, massth, muth, Nf,nl));
-     return als*erg;
-}
-
-
-double CRunDec::fas6to5ms(double A, double mass, double mu, double nlq, double nl){
-     double lmm=log((mu*mu)/(mass*mass));
-     if(nl==1){
-       return 1;
-     }
-     double sum[5];
-     sum[0]=  1.;
-     sum[1]=A*(lmm)/6.;
-     sum[2]=A*A*(-11./72. + (11.*lmm)/24. + lmm*lmm/36.);
-     sum[3]=A*A*A*(-564731./124416. + (2645.*lmm)/1728. + (167.*lmm*lmm)/576. + lmm*lmm*lmm/216. +
-   					(2633./31104. - (67.*lmm)/576. + lmm*lmm/36.)*nlq + (82043.*Zeta3)/27648.);
-     sum[4]=A*A*A*A*(-1165152397./24494400. - (3031309*A4)/54432 - (340853*A5)/11340
-                     +(1837*lmm*lmm)/1152 + (2909*lmm*lmm*lmm)/10368 + lmm*lmm*lmm*lmm/1296
-                     -(3031309*log(2)*log(2)*log(2)*log(2))/1306368 + (340853*log(2)*log(2)*log(2)*log(2)*log(2))/1360800
-                     +(3031309*log(2)*log(2)*Pi*Pi)/1306368 - (340853*log(2)*log(2)*log(2)*Pi*Pi)/816480
-                     +(76940219*Pi*Pi*Pi*Pi)/195955200 - (9318467*log(2)*Pi*Pi*Pi*Pi)/32659200 + nlq*nlq*(271883./4478976.
-                     -(6865*lmm)/186624 + (77*lmm*lmm)/20736 - lmm*lmm*lmm/324 - (167*Zeta3)/5184)
-                     +(2362581983*Zeta3)/87091200 + lmm*(-11093717./746496. + (3022001*Zeta3)/165888) + nlq*(4770941./2239488.
-                     -(685*A4)/5184 + (277*lmm*lmm)/10368 + (271*lmm*lmm*lmm)/5184 - (685*log(2)*log(2)*log(2)*log(2))/124416
-                     +(685*log(2)*log(2)*Pi*Pi)/124416 + (541549*Pi*Pi*Pi*Pi)/14929920 + lmm*(141937./373248.
-                     -(110779*Zeta3)/82944) - (3645913*Zeta3)/995328 - (115*Zeta5)/576) + (12057583*Zeta5)/483840);
-     double erg=0.0;
-     for(int i=1;i<=nl;i++){
-       erg+=sum[i-1];
-     }
-     return erg;
-}
-
-// Function double CRunDec::DecAsUpMS(double als, double massth, double muth,
-//                          int nl)
-double CRunDec::DecAsUpMS(double als, double massth, double muth, int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl <<" LOOPS"<<endl;
-       RETURN
-     }
-     double erg=(this->fas6to5ms(als/Pi, massth, muth, Nf,nl));
-     return als*erg;
-}
-
-double CRunDec::fas5to6ms(double A, double mass, double mu, double nlq, double nl){
-     double lmm=log((mu*mu)/(mass*mass));
-     if(nl==1){
-       return 1;
-     }
-     double sum[5];
-     sum[0]=  1.;
-     sum[1]=A*(-lmm)/6.;
-     sum[2]=A*A*(11./72. - (11*lmm)/24 + lmm*lmm/36.);
-     sum[3]=A*A*A*(564731./124416. - (955.*lmm)/576. + (53.*lmm*lmm)/576. - lmm*lmm*lmm/216.
-                   +(-2633./31104. + (67.*lmm)/576. - lmm*lmm/36.)*nlq - (82043.*Zeta3)/27648.);
-     sum[4]=A*A*A*A*(291716893./6123600. + (3031309*A4)/54432 + (340853*A5)/11340
-                     +(2177*lmm*lmm)/3456 - (1883*lmm*lmm*lmm)/10368 + lmm*lmm*lmm*lmm/1296
-                     +(3031309*log(2)*log(2)*log(2)*log(2))/1306368
-                     -(340853*log(2)*log(2)*log(2)*log(2)*log(2))/1360800
-                     -(3031309*log(2)*log(2)*Pi*Pi)/1306368 + (340853*log(2)*log(2)*log(2)*Pi*Pi)/816480
-                     -(76940219*Pi*Pi*Pi*Pi)/195955200 + (9318467*log(2)*Pi*Pi*Pi*Pi)/32659200
-                     +lmm*(7391699./746496. - (2529743*Zeta3)/165888) + nlq*nlq*(-271883./4478976.
-                     +(6865*lmm)/186624 - (77*lmm*lmm)/20736 + lmm*lmm*lmm/324 + (167*Zeta3)/5184)
-                     -(2362581983*Zeta3)/87091200 + nlq*(-4770941./2239488. + (685*A4)/5184
-                     -(1483*lmm*lmm)/10368 - (127*lmm*lmm*lmm)/5184 + (685*log(2)*log(2)*log(2)*log(2))/124416
-                     -(685*log(2)*log(2)*Pi*Pi)/124416 - (541549*Pi*Pi*Pi*Pi)/14929920 + (3645913*Zeta3)/995328
-                     +lmm*(-110341./373248. + (110779*Zeta3)/82944) + (115*Zeta5)/576) - (12057583*Zeta5)/483840);
-     double erg=0.0;
-     for(int i=1;i<=nl;i++){
-       erg+=sum[i-1];
-     }
-     return erg;
-}
-
-// Function double CRunDec::DecAsDownMS(double als, double massth, double muth,
-//                          int nl)
-double CRunDec::DecAsDownMS(double als, double massth, double muth, int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl <<" LOOPS"<<endl;
-       RETURN
-     }
-     double erg=(this->fas5to6ms(als/Pi, massth, muth, Nf,nl));
-     return als*erg;
-}
-
-
-double CRunDec::fas6to5si(double A, double mass, double mu, double nlq, double nl){
-     double lmmu=log((mu*mu)/(mass*mass));
-     if(nl==1){
-       return 1;
-     }
-     double sum[5];
-     sum[0] = 1.0;
-     sum[1] = (A*lmmu)/6.;
-     sum[2] = A*A*(-11./72. + (19.*lmmu)/24. + lmmu*lmmu/36.);
-     sum[3] = A*A*A*(-564731./124416. + (2191.*lmmu)/576. + (511.*lmmu*lmmu)/576. + lmmu*lmmu*lmmu/216. +
-              (2633./31104. - (281.*lmmu)/1728.)*nlq + (82043.*Zeta3)/27648.);
-     sum[4] = A*A*A*A*(-1165152397./24494400. - (3031309*A4)/54432 - (340853*A5)/11340 + (33887*lmmu*lmmu)/3456
-                       +(14149*lmmu*lmmu*lmmu)/10368 + lmmu*lmmu*lmmu*lmmu/1296
-                       -(3031309*log(2)*log(2)*log(2)*log(2))/1306368 + (340853*log(2)*log(2)*log(2)*log(2)*log(2))/1360800
-                       +(3031309*log(2)*log(2)*Pi*Pi)/1306368 - (340853*log(2)*log(2)*log(2)*Pi*Pi)/816480
-                       +(76940219*Pi*Pi*Pi*Pi)/195955200 - (9318467*log(2)*Pi*Pi*Pi*Pi)/32659200 + nlq*nlq*(271883./4478976.
-                       -(8545*lmmu)/186624 + (79*lmmu*lmmu)/6912 - (167*Zeta3)/5184) + (2362581983*Zeta3)/87091200
-                       +lmmu*(-1531493./746496. + (2975921*Zeta3)/165888) + nlq*(4770941./2239488. - (685*A4)/5184
-                       -(515*lmmu*lmmu)/1152 - (107*lmmu*lmmu*lmmu)/1728 - (685*log(2)*log(2)*log(2)*log(2))/124416
-                       +(685*log(2)*log(2)*Pi*Pi)/124416 + (541549*Pi*Pi*Pi*Pi)/14929920 + lmmu*(-158687./373248.
-                       -(133819*Zeta3)/82944) - (3645913*Zeta3)/995328 - (115*Zeta5)/576) + (12057583*Zeta5)/483840);
-     double erg=0.0;
-     for(int i=1;i<=nl;i++){
-       erg+=sum[i-1];
-     }
-     return erg;
-}
-
-// Function double CRunDec::DecAsUpSI(double als, double massth, double muth,
-//                          int nl)
-double CRunDec::DecAsUpSI(double als, double massth, double muth, int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl <<" LOOPS"<<endl;
-       RETURN
-     }
-     double erg=(this->fas6to5si(als/Pi, massth, muth, Nf,nl));
-     return als*erg;
-}
-
-double CRunDec::fas5to6si(double A, double mass, double mu, double nlq, double nl){
-     double lmmu=log((mu*mu)/(mass*mass));
-     if(nl==1){
-       return 1;
-     }
-     double sum[5];
-     sum[0] = 1;
-     sum[1] = -(A*lmmu)/6.;
-     sum[2] = A*A*(11./72. - (19.*lmmu)/24. + lmmu*lmmu/36.);
-     sum[3] = A*A*A*(564731./124416. - (6793.*lmmu)/1728. - (131.*lmmu*lmmu)/576. - lmmu*lmmu*lmmu/216. +
-              (-2633./31104. + (281.*lmmu)/1728.)*nlq - (82043.*Zeta3)/27648.);
-     sum[4] = A*A*A*A*(291716893./6123600. + (3031309*A4)/54432 + (340853*A5)/11340 - (14023*lmmu*lmmu)/3456
-                       -(8371*lmmu*lmmu*lmmu)/10368 + lmmu*lmmu*lmmu*lmmu/1296
-                       +(3031309*log(2)*log(2)*log(2)*log(2))/1306368 - (340853*log(2)*log(2)*log(2)*log(2)*log(2))/1360800
-                       -(3031309*log(2)*log(2)*Pi*Pi)/1306368 + (340853*log(2)*log(2)*log(2)*Pi*Pi)/816480
-                       -(76940219*Pi*Pi*Pi*Pi)/195955200 + (9318467*log(2)*Pi*Pi*Pi*Pi)/32659200 + lmmu*(-2398621./746496.
-                       -(2483663*Zeta3)/165888) + nlq*nlq*(-271883./4478976. + (8545*lmmu)/186624 - (79*lmmu*lmmu)/6912
-                       +(167*Zeta3)/5184) - (2362581983*Zeta3)/87091200 + nlq*(-4770941./2239488. + (685*A4)/5184
-                       +(983*lmmu*lmmu)/3456 + (107*lmmu*lmmu*lmmu)/1728 + (685*log(2)*log(2)*log(2)*log(2))/124416
-                       -(685*log(2)*log(2)*Pi*Pi)/124416 - (541549*Pi*Pi*Pi*Pi)/14929920 + (3645913*Zeta3)/995328
-                       +lmmu*(190283./373248. + (133819*Zeta3)/82944) + (115*Zeta5)/576) - (12057583*Zeta5)/483840);
-     double erg=0.0;
-     for(int i=1;i<=nl;i++){
-       erg+=sum[i-1];
-     }
-     return erg;
-}
-
-// Function double CRunDec::DecAsDownSI(double als, double massth, double muth,
-//                          int nl)
-double CRunDec::DecAsDownSI(double als, double massth, double muth, int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl <<" LOOPS"<<endl;
-       RETURN
-     }
-     double erg=(this->fas5to6si(als/Pi, massth, muth, Nf,nl));
-     return als*erg;
-}
-
-
-// Coefficients of eq.(33) of [RunDec]
-double CRunDec::fmq6to5os(double A, double mass, double mu, double nlq, double nl){
-     double lmM=log((mu*mu)/(mass*mass));
-     if(nl==1){
-       return 1;
-     }
-     double sum[5];
-     sum[0]=1.;
-     sum[1]=0.;
-     sum[2]=-A*A*(89./432. - (5.*lmM)/36. + lmM*lmM/12.);
-     sum[3]=-A*A*A*(1871./2916. - (4.*A4)/9. - log(2)*log(2)*log(2)*log(2)/54. + (299.*lmM)/2592.
-            + (299.*lmM*lmM)/432. + (35.*lmM*lmM*lmM)/216. + (1327.*nlq)/11664.
-            - (53.*lmM*nlq)/432. - (lmM*lmM*lmM*nlq)/108. + (log(2)*log(2)*Zeta2)/9. - (407.*Zeta3)/864.
-            - (5.*lmM*Zeta3)/6. - (2.*nlq*Zeta3)/27. + (103.*Zeta4)/72.);
-     sum[4]=A*A*A*A*(-122722873709./3292047360. - (6941*lmM*lmM*lmM)/2592 -
-       (1147*lmM*lmM*lmM*lmM)/3456 - (16187201*Pi*Pi*Pi*Pi)/52254720 + (787*Pi*Pi*Pi*Pi*Pi*Pi)/81648 +
-       (5*Zeta2)/9 + (5*log(2)*Zeta2)/27 - (5*Zeta3)/108 + (145*Pi*Pi*Pi*Pi*log(2))/1944 -
-       (1924649*Pi*Pi*log(2)*log(2))/4354560 + (59*Pi*Pi*log(2)*log(2)*log(2))/972 +
-       (1924649*log(2)*log(2)*log(2)*log(2))/4354560 - (59*log(2)*log(2)*log(2)*log(2)*log(2))/1620 - (4*log(2)*log(2)*log(2)*log(2)*log(2)*log(2))/81 +
-       (log(2)*log(2)*log(2)*log(2)*log(2)*log(16))/81 + (1924649*A4)/181440 +
-       (118*A5)/27 + nlq*nlq*(-17671./124416. - (31*lmM*lmM)/1296 -
-         lmM*lmM*lmM*lmM/864 + (7*Pi*Pi*Pi*Pi)/8640 + lmM*(3401./46656. - (7*Zeta3)/108) +
-         (5*Zeta3)/864) + (443509931*Zeta3)/40642560 -
-       (1061*Zeta3*Zeta3)/576 + lmM*lmM*(-34297./3456. + (175*Zeta3)/48) +
-       lmM*(99319./41472. - (481*Pi*Pi*Pi*Pi)/2880 - (2*Zeta2)/3 - (2*log(2)*Zeta2)/9 +
-         Zeta3/18 - (11*Pi*Pi*log(2)*log(2))/72 + (11*log(2)*log(2)*log(2)*log(2))/72 +
-         (11*A4)/3 + (47317*Zeta3)/3072 - (575*Zeta5)/72) +
-       nlq*(2403419./746496. + (10237*lmM*lmM)/10368 + (47*lmM*lmM*lmM)/288 +
-         (17*lmM*lmM*lmM*lmM)/432 + (245*Pi*Pi*Pi*Pi)/62208 - (5*Zeta2)/54 -
-         (49*Pi*Pi*Pi*Pi*log(2))/6480 + (49*Pi*Pi*log(2)*log(2))/2592 -
-         (Pi*Pi*log(2)*log(2)*log(2))/162 - (49*log(2)*log(2)*log(2)*log(2))/2592 + log(2)*log(2)*log(2)*log(2)*log(2)/270 -
-         (49*A4)/108 - (4*A5)/9 +
-         lmM*(-26443./93312. + (163*Pi*Pi*Pi*Pi)/12960 + Zeta2/9 + (Pi*Pi*log(2)*log(2))/108 -
-           log(2)*log(2)*log(2)*log(2)/108 - (2*A4)/9 - (599*Zeta3)/1728) +
-         (1075*Zeta3)/1728 - (497*Zeta5)/288) + (59015*Zeta5)/1728);
-
-     double erg=0.0;
-     for(int i=1;i<=nl;i++){
-       erg+=sum[i-1];
-     }
-     return erg;
-}
-
-double CRunDec::fmq6to5ms(double A, double mass, double mu, double nlq, double nl){
-     double lmm=log((mu*mu)/(mass*mass));
-     if(nl==1){
-       return 1;
-     }
-     double sum[5];
-     sum[0]=1.;
-     sum[1]=0.;
-     sum[2]=A*A*(-89./432. + (5*lmm)/36 - lmm*lmm/12);
-     sum[3]=A*A*A*(-2951./2916. + (16*A4+2./3.*log(2)*log(2)*log(2)*log(2)-2./3.*Pi*Pi*log(2)*log(2)-13./180.*Pi*Pi*Pi*Pi)/36
-                   -(155*lmm*lmm)/432 - (35*lmm*lmm*lmm)/216 - Pi*Pi*Pi*Pi/72
-                   +nl*(-1327./11664. + (53*lmm)/432 + lmm*lmm*lmm/108 + (2*Zeta3)/27)
-                   +lmm*(133./2592. + (5*Zeta3)/6) + (407*Zeta3)/864);
-     sum[4]=A*A*A*A*(-131621265869./3292047360. + (1924649*A4)/181440 + (118*A5)/27
-                     -(3161*lmm*lmm*lmm)/2592 - (1147*lmm*lmm*lmm*lmm)/3456
-                     +(1924649*log(2)*log(2)*log(2)*log(2))/4354560 - (59*log(2)*log(2)*log(2)*log(2)*log(2))/1620
-                     +(log(16)*log(2)*log(2)*log(2)*log(2)*log(2))/81 - (4*log(2)*log(2)*log(2)*log(2)*log(2)*log(2))/81
-                     -(1924649*log(2)*log(2)*Pi*Pi)/4354560 + (59*log(2)*log(2)*log(2)*Pi*Pi)/972
-                     -(16187201*Pi*Pi*Pi*Pi)/52254720 + (145*log(2)*Pi*Pi*Pi*Pi)/1944 + (787*Pi*Pi*Pi*Pi*Pi*Pi)/81648
-                     +nlq*nlq*(-17671./124416. - (31*lmm*lmm)/1296 - lmm*lmm*lmm*lmm/864 + (7*Pi*Pi*Pi*Pi)/8640
-                     +lmm*(3401./46656. - (7*Zeta3)/108) + (5*Zeta3)/864) + (353193131*Zeta3)/40642560
-                     -(1061*Zeta3*Zeta3)/576 + lmm*lmm*(-16193./3456. + (175*Zeta3)/48) + lmm*(279367./41472.
-                     +(11*A4)/3 + (11*log(2)*log(2)*log(2)*log(2))/72 - (11*log(2)*log(2)*Pi*Pi)/72
-                     -(481*Pi*Pi*Pi*Pi)/2880 + (42197*Zeta3)/3072 - (575*Zeta5)/72) + nlq*(2261435./746496.
-                     -(49*A4)/108 - (4*A5)/9 + (8461*lmm*lmm)/10368 + (23*lmm*lmm*lmm)/288 + (17*lmm*lmm*lmm*lmm)/432
-                     -(49*log(2)*log(2)*log(2)*log(2))/2592 + log(2)*log(2)*log(2)*log(2)*log(2)/270
-                     +(49*log(2)*log(2)*Pi*Pi)/2592 - (log(2)*log(2)*log(2)*Pi*Pi)/162 + (245*Pi*Pi*Pi*Pi)/62208
-                     -(49*log(2)*Pi*Pi*Pi*Pi)/6480 + lmm*(-55315./93312. - (2*A4)/9 - log(2)*log(2)*log(2)*log(2)/108
-                     +(log(2)*log(2)*Pi*Pi)/108 + (163*Pi*Pi*Pi*Pi)/12960 - (599*Zeta3)/1728)
-                     +(1075*Zeta3)/1728 - (497*Zeta5)/288) + (59015*Zeta5)/1728);
-     double erg=0.0;
-     for(int i=1;i<=nl;i++){
-       erg+=sum[i-1];
-     }
-     return erg;
-}
-
-double CRunDec::fmq6to5si(double A, double mass, double mu, double nlq, double nl){
-     double lmmu=log((mu*mu)/(mass*mass));
-     if(nl==1){
-       return 1;
-     }
-     double sum[5];
-     sum[0]=1.;
-     sum[1]=0.;
-     sum[2]=A*A*(-89./432. + (5*lmmu)/36 - lmmu*lmmu/12);
-     sum[3]=A*A*A*(-2951./2916. - (299*lmmu*lmmu)/432 - (35*lmmu*lmmu*lmmu)/216 - Pi*Pi*Pi*Pi/72 + (16*A4
-                   +(2*log(2)*log(2)*log(2)*log(2))/3 - (2*log(2)*log(2)*Pi*Pi)/3 - (13*Pi*Pi*Pi*Pi)/180)/36
-                   +nlq*(-1327./11664. + (53*lmmu)/432 + lmmu*lmmu*lmmu/108 + (2*Zeta3)/27) + lmmu*(853./2592.
-                   +(5*Zeta3)/6) + (407*Zeta3)/864);
-     sum[4]=A*A*A*A*(-131621265869./3292047360. + (1924649*A4)/181440 + (118*A5)/27 - (6941*lmmu*lmmu*lmmu)/2592
-                     -(1147*lmmu*lmmu*lmmu*lmmu)/3456 + (1924649*log(2)*log(2)*log(2)*log(2))/4354560
-                     -(59*log(2)*log(2)*log(2)*log(2)*log(2))/1620 + (log(16)*log(2)*log(2)*log(2)*log(2)*log(2))/81
-                     -(4*log(2)*log(2)*log(2)*log(2)*log(2)*log(2))/81 - (1924649*log(2)*log(2)*Pi*Pi)/4354560
-                     +(59*log(2)*log(2)*log(2)*Pi*Pi)/972 - (16187201*Pi*Pi*Pi*Pi)/52254720
-                     +(145*log(2)*Pi*Pi*Pi*Pi)/1944 + (787*Pi*Pi*Pi*Pi*Pi*Pi)/81648 + nlq*nlq*(-17671./124416.
-                     -(31*lmmu*lmmu)/1296 - lmmu*lmmu*lmmu*lmmu/864 + (7*Pi*Pi*Pi*Pi)/8640 + lmmu*(3401./46656.
-                     -(7*Zeta3)/108) + (5*Zeta3)/864) + (353193131*Zeta3)/40642560 - (1061*Zeta3*Zeta3)/576
-                     +lmmu*lmmu*(-8531./1152. + (175*Zeta3)/48) + lmmu*(330503./41472. + (11*A4)/3
-                     +(11*log(2)*log(2)*log(2)*log(2))/72 - (11*log(2)*log(2)*Pi*Pi)/72 - (481*Pi*Pi*Pi*Pi)/2880
-                     +(47317*Zeta3)/3072 - (575*Zeta5)/72) + nlq*(2261435./746496. - (49*A4)/108 - (4*A5)/9
-                     +(8701*lmmu*lmmu)/10368 + (47*lmmu*lmmu*lmmu)/288 + (17*lmmu*lmmu*lmmu*lmmu)/432
-                     -(49*log(2)*log(2)*log(2)*log(2))/2592 + log(2)*log(2)*log(2)*log(2)*log(2)/270
-                     +(49*log(2)*log(2)*Pi*Pi)/2592 - (log(2)*log(2)*log(2)*Pi*Pi)/162 + (245*Pi*Pi*Pi*Pi)/62208
-                     -(49*log(2)*Pi*Pi*Pi*Pi)/6480 + lmmu*(-36019./93312. - (2*A4)/9 - log(2)*log(2)*log(2)*log(2)/108
-                     +(log(2)*log(2)*Pi*Pi)/108 + (163*Pi*Pi*Pi*Pi)/12960 - (599*Zeta3)/1728) + (1075*Zeta3)/1728
-                     -(497*Zeta5)/288) + (59015*Zeta5)/1728);
-     double erg=0.0;
-     for(int i=1;i<=nl;i++){
-       erg+=sum[i-1];
-     }
-     return erg;
-}
-
-// Function double CRunDec::DecMqUpOS(double als, double massth, double muth,
-//                          int nl)
-double CRunDec::DecMqUpOS(double mq, double als, double massth, double muth,
-                           int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     double erg=(this->fmq6to5os(als/Pi, massth, muth, Nf,nl));
-     return mq*erg;
-}
-
-// Function double CRunDec::DecMqUpMS(double als, double massth, double muth,
-//                          int nl)
-double CRunDec::DecMqUpMS(double mq, double als, double massth, double muth,
-                           int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     double erg=(this->fmq6to5ms(als/Pi, massth, muth, Nf,nl));
-     return mq*erg;
-}
-
-// Function double CRunDec::DecMqUpSI(double als, double massth, double muth,
-//                          int nl)
-double CRunDec::DecMqUpSI(double mq, double als, double massth, double muth,
-                           int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     double erg=(this->fmq6to5si(als/Pi, massth, muth, Nf,nl));
-     return mq*erg;
-}
-
-// Coefficients of eq.(30) of [RunDec]
-double CRunDec::fmq5to6os(double A, double mass, double mu, double nlq, double nl){
-     double lmM=log((mu*mu)/(mass*mass));
-     if(nl==1){
-       return 1;
-     }
-     double sum[5];
-     sum[0]=1.;
-     sum[1]=0.;
-     sum[2]=A*A*(89./432. - (5.*lmM)/36. + lmM*lmM/12.);
-     sum[3]=A*A*A*(1871./2916. - (4.*A4)/9. - ln2*ln2*ln2*ln2/54. + (121.*lmM)/2592.
-                   +(319.*lmM*lmM)/432. + (29.*lmM*lmM*lmM)/216. + (1327.*nlq)/11664.
-                   -(53.*lmM*nlq)/432. - (lmM*lmM*lmM*nlq)/108. + (ln2*ln2*Zeta2)/9.
-                   -(407.*Zeta3)/864. - (5.*lmM*Zeta3)/6. - (2.*nlq*Zeta3)/27. + (103.*Zeta4)/72.);
-     sum[4]=A*A*A*A*(122466970229./3292047360. - (1924649.*A4)/181440. - (118.*A5)/27.
-                     -(1924649.*ln2*ln2*ln2*ln2)/4354560. + (59.*ln2*ln2*ln2*ln2*ln2)/1620.
-                     -(1126487.*lmM)/373248. - (31.*A4*lmM)/9.-(31.*ln2*ln2*ln2*ln2*lmM)/216.
-                     +(104803.*lmM*lmM)/10368. + (1403.*lmM*lmM*lmM)/648. + (305.*lmM*lmM*lmM*lmM)/1152.
-                     -(2403419.*nlq)/746496. + (49.*A4*nlq)/108. + (4.*A5*nlq)/9. + (49.*ln2*ln2*ln2*ln2*nlq)/2592.
-                     -(ln2*ln2*ln2*ln2*ln2*nlq)/270. + (7045.*lmM*nlq)/31104. + (2.*A4*lmM*nlq)/9.
-                     +1./108.*ln2*ln2*ln2*ln2*lmM*nlq - (9601.*lmM*lmM*nlq)/10368. - (47.*lmM*lmM*lmM*nlq)/288.
-                     -(5.*lmM*lmM*lmM*lmM*nlq)/144. + (17671.*nlq*nlq)/124416. - (3401.*lmM*nlq*nlq)/46656.
-                     +(31.*lmM*lmM*nlq*nlq)/1296. + (lmM*lmM*lmM*lmM*nlq*nlq)/864. - (5.*Zeta2)/9.
-                     -(5.*ln2*Zeta2)/27. + (1924649.*ln2*ln2*Zeta2)/725760. - (59.*ln2*ln2*ln2*Zeta2)/162.
-                     +(2.*lmM*Zeta2)/3. + (2.*ln2*lmM*Zeta2)/9. + 31./36.*ln2*ln2*lmM*Zeta2 + (5.*nlq*Zeta2)/54.
-                     -49./432.*ln2*ln2*nlq*Zeta2 + 1./27.*ln2*ln2*ln2*nlq*Zeta2 - (lmM*nlq*Zeta2)/9.
-                     - 1./18.*ln2*ln2*lmM*nlq*Zeta2 - (441628331.*Zeta3)/40642560. - (420877.*lmM*Zeta3)/27648.
-                     -(155.*lmM*lmM*Zeta3)/48. - (1075.*nlq*Zeta3)/1728. + (221.*lmM*nlq*Zeta3)/576.
-                     -(5.*nlq*nlq*Zeta3)/864. + 7./108.*lmM*nlq*nlq*Zeta3 + (1061.*Zeta3*Zeta3)/576.
-                     +(16187201.*Zeta4)/580608. - (725.*ln2*Zeta4)/108. + (4123.*lmM*Zeta4)/288.
-                     -(1225.*nlq*Zeta4)/3456. + (49.*ln2*nlq*Zeta4)/72. - (163.*lmM*nlq*Zeta4)/144.
-                     -(7.*nlq*nlq*Zeta4)/96. - (59015.*Zeta5)/1728. + (575.*lmM*Zeta5)/72.
-                     +(497.*nlq*Zeta5)/288. - (3935.*Zeta6)/432.);
-
-     double erg=0.0;
-     for(int i=1;i<=nl;i++){
-       erg+=sum[i-1];
-     }
-     return erg;
-}
-
-double CRunDec::fmq5to6ms(double A, double mass, double mu, double nlq, double nl){
-     double lmm=log((mu*mu)/(mass*mass));
-     if(nl==1){
-       return 1;
-     }
-     double sum[5];
-     sum[0]=1.;
-     sum[1]=0.;
-     sum[2]=A*A*(89./432. - (5.*lmm)/36. + lmm*lmm/12.);
-     sum[3]=A*A*A*(2951./2916. - (16*A4+2./3.*log(2)*log(2)*log(2)*log(2)-2./3.*Pi*Pi*log(2)*log(2)-13./180.*Pi*Pi*Pi*Pi)/36
-                   +(175*lmm*lmm)/432 + (29*lmm*lmm*lmm)/216 + Pi*Pi*Pi*Pi/72
-                   +lmm*(-311./2592. - (5*Zeta3)/6)
-                   +nlq*(1327./11664. - (53*lmm)/432 - lmm*lmm*lmm/108 - (2*Zeta3)/27) - (407*Zeta3)/864);
-     sum[4]=A*A*A*A*(131968227029./3292047360. - (1924649*A4)/181440 - (118*A5)/27
-                     +(301*lmm*lmm*lmm)/324 + (305*lmm*lmm*lmm*lmm)/1152 - (1924649*log(2)*log(2)*log(2)*log(2))/4354560
-                     +(59*log(2)*log(2)*log(2)*log(2)*log(2))/1620 - (log(16)*log(2)*log(2)*log(2)*log(2)*log(2))/81
-                     +(4*log(2)*log(2)*log(2)*log(2)*log(2)*log(2))/81 + (1924649*log(2)*log(2)*Pi*Pi)/4354560
-                     -(59*log(2)*log(2)*log(2)*Pi*Pi)/972 + (16187201*Pi*Pi*Pi*Pi)/52254720
-                     -(145*log(2)*Pi*Pi*Pi*Pi)/1944 - (787*Pi*Pi*Pi*Pi*Pi*Pi)/81648 + lmm*lmm*(51163./10368.
-                     -(155*Zeta3)/48) + nlq*nlq*(17671./124416. + (31*lmm*lmm)/1296 + lmm*lmm*lmm*lmm/864
-                     -(7*Pi*Pi*Pi*Pi)/8640 + lmm*(-3401./46656. + (7*Zeta3)/108) - (5*Zeta3)/864)
-                     -(353193131*Zeta3)/40642560 + (1061*Zeta3*Zeta3)/576 - (59015*Zeta5)/1728
-                     +nlq*(-2261435./746496. + (49*A4)/108 + (4*A5)/9 - (7825*lmm*lmm)/10368 - (23*lmm*lmm*lmm)/288
-                     -(5*lmm*lmm*lmm*lmm)/144 + (49*log(2)*log(2)*log(2)*log(2))/2592
-                     -log(2)*log(2)*log(2)*log(2)*log(2)/270 - (49*log(2)*log(2)*Pi*Pi)/2592
-                     +(log(2)*log(2)*log(2)*Pi*Pi)/162 - (245*Pi*Pi*Pi*Pi)/62208 + (49*log(2)*Pi*Pi*Pi*Pi)/6480
-                     +lmm*(16669./31104. + (2*A4)/9 + log(2)*log(2)*log(2)*log(2)/108 - (log(2)*log(2)*Pi*Pi)/108
-                     -(163*Pi*Pi*Pi*Pi)/12960 + (221*Zeta3)/576) - (1075*Zeta3)/1728 + (497*Zeta5)/288)
-                     +lmm*(-2810855./373248. - (31*A4)/9 - (31*log(2)*log(2)*log(2)*log(2))/216
-                     +(31*log(2)*log(2)*Pi*Pi)/216 + (4123*Pi*Pi*Pi*Pi)/25920 - (373261*Zeta3)/27648 + (575*Zeta5)/72));
-
-     double erg=0.0;
-     for(int i=1;i<=nl;i++){
-       erg+=sum[i-1];
-     }
-     return erg;
-}
-
-double CRunDec::fmq5to6si(double A, double mass, double mu, double nlq, double nl){
-     double lmmu=log((mu*mu)/(mass*mass));
-     if(nl==1){
-       return 1;
-     }
-     double sum[5];
-     sum[0]=1.;
-     sum[1]=0.;
-     sum[2]=A*A*(89./432. - (5*lmmu)/36 + lmmu*lmmu/12);
-     sum[3]=A*A*A*(2951./2916. + (319*lmmu*lmmu)/432 + (29*lmmu*lmmu*lmmu)/216 + Pi*Pi*Pi*Pi/72 + (-16*A4
-                   -(2*log(2)*log(2)*log(2)*log(2))/3 + (2*log(2)*log(2)*Pi*Pi)/3 + (13*Pi*Pi*Pi*Pi)/180)/36
-                   +lmmu*(-1031./2592. - (5*Zeta3)/6) + nlq*(1327./11664. - (53*lmmu)/432 - lmmu*lmmu*lmmu/108
-                   -(2*Zeta3)/27) - (407*Zeta3)/864);
-     sum[4]=A*A*A*A*(131968227029./3292047360. - (1924649*A4)/181440 - (118*A5)/27 + (1403*lmmu*lmmu*lmmu)/648
-                     +(305*lmmu*lmmu*lmmu*lmmu)/1152 - (1924649*log(2)*log(2)*log(2)*log(2))/4354560
-                     +(59*log(2)*log(2)*log(2)*log(2)*log(2))/1620 - (log(16)*log(2)*log(2)*log(2)*log(2)*log(2))/81
-                     +(4*log(2)*log(2)*log(2)*log(2)*log(2)*log(2))/81 + (1924649*log(2)*log(2)*Pi*Pi)/4354560
-                     -(59*log(2)*log(2)*log(2)*Pi*Pi)/972 + (16187201*Pi*Pi*Pi*Pi)/52254720 - (145*log(2)*Pi*Pi*Pi*Pi)/1944
-                     -(787*Pi*Pi*Pi*Pi*Pi*Pi)/81648 + lmmu*lmmu*(81763./10368. - (155*Zeta3)/48) + nlq*nlq*(17671./124416.
-                     +(31*lmmu*lmmu)/1296 + lmmu*lmmu*lmmu*lmmu/864 - (7*Pi*Pi*Pi*Pi)/8640 + lmmu*(-3401./46656.
-                     +(7*Zeta3)/108) - (5*Zeta3)/864) - (353193131*Zeta3)/40642560 + (1061*Zeta3*Zeta3)/576
-                     -(59015*Zeta5)/1728 + nlq*(-2261435./746496. + (49*A4)/108 + (4*A5)/9 - (8065*lmmu*lmmu)/10368
-                     -(47*lmmu*lmmu*lmmu)/288 - (5*lmmu*lmmu*lmmu*lmmu)/144 + (49*log(2)*log(2)*log(2)*log(2))/2592
-                     -log(2)*log(2)*log(2)*log(2)*log(2)/270 - (49*log(2)*log(2)*Pi*Pi)/2592 + (log(2)*log(2)*log(2)*Pi*Pi)/162
-                     -(245*Pi*Pi*Pi*Pi)/62208 + (49*log(2)*Pi*Pi*Pi*Pi)/6480 + lmmu*(10237./31104. + (2*A4)/9
-                     +log(2)*log(2)*log(2)*log(2)/108 - (log(2)*log(2)*Pi*Pi)/108 - (163*Pi*Pi*Pi*Pi)/12960 + (221*Zeta3)/576)
-                     -(1075*Zeta3)/1728 + (497*Zeta5)/288) + lmmu*(-3322343./373248. - (31*A4)/9
-                     -(31*log(2)*log(2)*log(2)*log(2))/216 + (31*log(2)*log(2)*Pi*Pi)/216 + (4123*Pi*Pi*Pi*Pi)/25920
-                     -(419341*Zeta3)/27648 + (575*Zeta5)/72));
-
-     double erg=0.0;
-     for(int i=1;i<=nl;i++){
-       erg+=sum[i-1];
-     }
-     return erg;
-}
-
-// Function double CRunDec::DecMqDownOS(double als, double massth, double muth,
-//                          int nl)
-double CRunDec::DecMqDownOS(double mq, double als, double massth, double muth,
-                           int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     double erg=(this->fmq5to6os(als/Pi, massth, muth, Nf,nl));
-     return mq*erg;
-}
-
-// Function double CRunDec::DecMqDownMS(double als, double massth, double muth,
-//                          int nl)
-double CRunDec::DecMqDownMS(double mq, double als, double massth, double muth,
-                           int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     double erg=(this->fmq5to6ms(als/Pi, massth, muth, Nf,nl));
-     return mq*erg;
-}
-
-// Function double CRunDec::DecMqDownSI(double als, double massth, double muth,
-//                          int nl)
-double CRunDec::DecMqDownSI(double mq, double als, double massth, double muth,
-                           int nl){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     double erg=(this->fmq5to6si(als/Pi, massth, muth, Nf,nl));
-     return mq*erg;
-}
-
-// Function double CRunDec::DecLambdaDown(double lam, double massth, int nl,
-//                          int nloops)
-double CRunDec::DecLambdaDown(double lam, double massth, int nl,
-                           int nloops){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     SetConstants(nl+1);
-     double l=log((massth*massth)/(lam*lam));
-     double sum[5];
-     double b0p2 = Betap[0]*2.;
-     double c2 = 11./72.;
-     double c3 = (564731./124416. - 2633./31104.*(nl) - (82043.*Zeta3)/27648.);
-     double c4 = (291716893./6123600. + (3031309.*A4)/54432. + (340853.*A5)/11340.
-                       +(3031309.*log(2)*log(2)*log(2)*log(2))/1306368. - (340853.*log(2)*log(2)*log(2)*log(2)*log(2))/1360800.
-                       -(3031309.*log(2)*log(2)*Pi*Pi)/1306368. + (340853.*log(2)*log(2)*log(2)*Pi*Pi)/816480.
-                       -(76940219.*Pi*Pi*Pi*Pi)/195955200. + (9318467.*log(2)*Pi*Pi*Pi*Pi)/32659200.
-                       +(nl)*(nl)*(-271883./4478976.
-                       +(167.*Zeta3)/5184.) - (2362581983.*Zeta3)/87091200. + (nl)*(-4770941./2239488. + (685.*A4)/5184.
-                       +(685.*log(2)*log(2)*log(2)*log(2))/124416.
-                       -(685.*log(2)*log(2)*Pi*Pi)/124416. - (541549.*Pi*Pi*Pi*Pi)/14929920. + (3645913.*Zeta3)/995328.
-                       +(115.*Zeta5)/576.) - (12057583.*Zeta5)/483840.);
-     sum[0]= l*(Betap[0]-Beta[0])/b0p2;
-     sum[1]= ((Bp[1]-B[1])*log(l) - Bp[1]*log(Betap[0]/Beta[0]))/b0p2;
-     sum[2]= (c2 + B[2] - Bp[2] - B[1]*B[1] + Bp[1]*Bp[1] + log(l)*B[1]*(Bp[1]-B[1]))/(b0p2*Beta[0]*l);
-     sum[3]= (c3 - (Bp[3]-B[3])/2. + Bp[1]*(Bp[2]-B[2]-c2) - Bp[1]*Bp[1]*Bp[1]/2. - B[1]*(Bp[1]*Bp[1] - Bp[2] + B[2] + c2)*log(l)
-              -Bp[1]*B[1]*B[1]*(log(l)*log(l)/2. - log(l) - 1.) + B[1]*B[1]*B[1]*(log(l)*log(l)-1.)/2.)/(b0p2*Beta[0]*Beta[0]*l*l);
-     sum[4]= (c4 - (Bp[4]-B[4])/3. - B[1]*B[3]/6. + Bp[1]*(2*Bp[3]/3. - B[3]/2. - c3) - c2*c2 + (Bp[2]-B[2])*(Bp[2]/3. - 2.*B[2]/3. - c2)
-              -Bp[1]*Bp[1]*(Bp[2]-B[2]-c2) + Bp[1]*Bp[1]*Bp[1]*Bp[1]/3. + B[1]*log(l)*(Bp[1]*Bp[1]*Bp[1] - 2.*Bp[1]*(Bp[2] - B[2] - c2)
-              + Bp[3] - B[3] - 2.*c3) + B[1]*B[1]*(Bp[1]*Bp[1] - Bp[2] + B[2] + c2)*(log(l)*log(l) - log(l) - 1.)
-              + Bp[1]*B[1]*B[1]*B[1]*(log(l)*log(l)*log(l)/3.-3.*log(l)*log(l)/2. - log(l) + 1./2.) - B[1]*B[1]*B[1]*B[1]*(
-              log(l)*log(l)*log(l)/3. - log(l)*log(l)/2. - log(l) - 1./6.))/(b0p2*Beta[0]*Beta[0]*Beta[0]*l*l*l);
-     double erg=0.0;
-     for(int i=0;i<nloops;i++){
-       erg+=sum[i];
-     }
-
-     return (lam*exp(erg));
-}
-
-// Function double CRunDec::DecLambdaUp(double lam, double massth, int nl,
-//                          int nloops)
-double CRunDec::DecLambdaUp(double lam, double massth, int nl,
-                           int nloops){
-     if(nl<1||nl>5){
-       cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
-       RETURN
-     }
-     SetConstants(nl+1);
-     double l=log((massth*massth)/(lam*lam));
-     double sum[5];
-     double b02 = Beta[0]*2.;
-     double c2 = 11./72.;
-     double c3 = (564731./124416. - 2633./31104.*(nl) - (82043.*Zeta3)/27648.);
-     double c4 = (291716893./6123600. + (3031309.*A4)/54432. + (340853.*A5)/11340.
-                       +(3031309.*log(2)*log(2)*log(2)*log(2))/1306368. - (340853.*log(2)*log(2)*log(2)*log(2)*log(2))/1360800.
-                       -(3031309.*log(2)*log(2)*Pi*Pi)/1306368. + (340853.*log(2)*log(2)*log(2)*Pi*Pi)/816480.
-                       -(76940219.*Pi*Pi*Pi*Pi)/195955200. + (9318467.*log(2)*Pi*Pi*Pi*Pi)/32659200.
-                       +(nl)*(nl)*(-271883./4478976.
-                       +(167.*Zeta3)/5184.) - (2362581983.*Zeta3)/87091200. + (nl)*(-4770941./2239488. + (685.*A4)/5184.
-                       +(685.*log(2)*log(2)*log(2)*log(2))/124416.
-                       -(685.*log(2)*log(2)*Pi*Pi)/124416. - (541549.*Pi*Pi*Pi*Pi)/14929920. + (3645913.*Zeta3)/995328.
-                       +(115.*Zeta5)/576.) - (12057583.*Zeta5)/483840.);
-     sum[0]= l*(Beta[0]-Betap[0])/b02;
-     sum[1]= ((B[1]-Bp[1])*log(l) - B[1]*log(Beta[0]/Betap[0]))/b02;
-     sum[2]= (-c2 + Bp[2] - B[2] - Bp[1]*Bp[1] + B[1]*B[1] + log(l)*Bp[1]*(B[1]-Bp[1]))/(b02*Betap[0]*l);
-     sum[3]= (-c3 + (Bp[3]-B[3])/2. + B[1]*(B[2]-Bp[2]+c2) - B[1]*B[1]*B[1]/2. - Bp[1]*(B[1]*B[1] - B[2] + Bp[2] - c2)*log(l)
-              -B[1]*Bp[1]*Bp[1]*(log(l)*log(l)/2. - log(l) - 1.) + Bp[1]*Bp[1]*Bp[1]*(log(l)*log(l)-1.)/2.)/(b02*Betap[0]*Betap[0]*l*l);
-     sum[4]= (-c4 + (Bp[4]-B[4])/3. - Bp[1]*Bp[3]/6. + B[1]*(2*B[3]/3. - Bp[3]/2. + c3) - c2*c2 + (B[2]-Bp[2])*(B[2]/3. - 2.*Bp[2]/3. + c2)
-              -B[1]*B[1]*(B[2]-Bp[2]+c2) + B[1]*B[1]*B[1]*B[1]/3. + Bp[1]*log(l)*(B[1]*B[1]*B[1] - 2.*B[1]*(B[2] - Bp[2] + c2)
-              + B[3] - Bp[3] + 2.*c3) + Bp[1]*Bp[1]*(B[1]*B[1] - B[2] + Bp[2] - c2)*(log(l)*log(l) - log(l) - 1.)
-              + Bp[1]*Bp[1]*Bp[1]*B[1]*(log(l)*log(l)*log(l)/3.-3.*log(l)*log(l)/2. - log(l) + 1./2.) - Bp[1]*Bp[1]*Bp[1]*Bp[1]*(
-              log(l)*log(l)*log(l)/3. - log(l)*log(l)/2. - log(l) - 1./6.))/(b02*Betap[0]*Betap[0]*Betap[0]*l*l*l);
-     double erg=0.0;
-     for(int i=0;i<nloops;i++){
-       erg+=sum[i];
-     }
-
-     return (lam*exp(erg));
-}
-
-// Function double CRunDec::AlL2AlH(double asl, double mu1, TriplenfMmu decpar[],
-//                          double mu2, int nl)
-double CRunDec::AlL2AlH(double asl, double mu1, TriplenfMmu decpar[], double mu2,
-                         int nl){
-     int n=0;
-     int help;
-     double help2;
-     double asini=asl;
-     double muini=mu1;
-     for(int i=0; i<4; i++){
-       if(decpar[i].nf!=0){
-         n+=1;
-       }
-     }
-     int zaehler=4;
-     while (zaehler!=0){
-       for(int i=0; i<zaehler-1; i++){
-         if(decpar[i].nf>decpar[i+1].nf){
-           help=decpar[i].nf;
-           decpar[i].nf=decpar[i+1].nf;
-           decpar[i+1].nf=help;
-           help2=decpar[i].Mth;
-           decpar[i].Mth=decpar[i+1].Mth;
-           decpar[i+1].Mth=help2;
-           help2=decpar[i].muth;
-           decpar[i].muth=decpar[i+1].muth;
-           decpar[i+1].muth=help2;
-         }
-       }
-       zaehler-=1;
-     }
-     for(int i=3-n+2;i<=3;i++){
-       if(decpar[i].nf-decpar[i-1].nf!=1){
-         cout<<"WARNING: THERE IS A GAP IN NUMBER OF FLAVOURS. EXIT."<<endl;
-         RETURN
-       }
-     }
-     double erg1,erg2;
-     int i;
-     for(i=3-n+1;i<=3;i++){
-       erg1= AlphasExact(asini, muini, decpar[i].muth,decpar[i].nf-1,nl);
-       erg2= DecAsUpOS(erg1,decpar[i].Mth,decpar[i].muth,decpar[i].nf-1,nl);
-       asini=erg2;
-       muini=decpar[i].muth;
-     }
-     double alpha= AlphasExact(asini,muini,mu2,decpar[i-1].nf,nl);
-     for(int j=0;j<=3;j++){
-       decpar[j].nf=0;
-       decpar[j].Mth=0.;
-       decpar[j].muth=0.;
-     }
-     return alpha;
-}
-
-// Function double CRunDec::AlH2AlL(double ash, double mu1, TriplenfMmu decpar[],
-//                          double mu2, int nl)
-double CRunDec::AlH2AlL(double ash, double mu1, TriplenfMmu decpar[], double mu2,
-                         int nl){
-     int n=0;
-     int help;
-     double help2;
-     double asini=ash;
-     double muini=mu1;
-     for(int i=0; i<4; i++){
-       if(decpar[i].nf!=0){
-         n+=1;
-       }
-     }
-     int zaehler=4;
-     while (zaehler!=0){
-       for(int i=0; i<zaehler-1; i++){
-         if(decpar[i].nf<decpar[i+1].nf){
-           help=decpar[i].nf;
-           decpar[i].nf=decpar[i+1].nf;
-           decpar[i+1].nf=help;
-           help2=decpar[i].Mth;
-           decpar[i].Mth=decpar[i+1].Mth;
-           decpar[i+1].Mth=help2;
-           help2=decpar[i].muth;
-           decpar[i].muth=decpar[i+1].muth;
-           decpar[i+1].muth=help2;
-         }
-       }
-       zaehler-=1;
-     }
-     for(int i=1;i<=n-1;i++){
-       if(decpar[i].nf-decpar[i-1].nf!=-1){
-         cout<<"WARNING: THERE IS A GAP IN NUMBER OF FLAVOURS. EXIT.";
-         RETURN
-       }
-     }
-     double erg1,erg2;
-     int i;
-     for(i=0;i<=n-1;i++){
-       erg1= AlphasExact(asini, muini, decpar[i].muth,decpar[i].nf,nl);
-       erg2= DecAsDownOS(erg1,decpar[i].Mth,decpar[i].muth,decpar[i].nf-1,nl);
-       asini=erg2;
-       muini=decpar[i].muth;
-     }
-     double alpha= AlphasExact(asini,muini,mu2,decpar[i-1].nf-1,nl);
-     for(int j=0;j<=3;j++){
-       decpar[j].nf=0;
-       decpar[j].Mth=0.;
-       decpar[j].muth=0.;
-     }
-     return alpha;
-}
-
-// Function double CRunDec::mL2mH(double mql, double asl, double mu1,
-//                         TriplenfMmu decpar[], double mu2, int nl)
-double CRunDec::mL2mH(double mql, double asl, double mu1, TriplenfMmu decpar[],
-                       double mu2, int nl){
-     int n=0;
-     int help;
-     double help2;
-     double asini=asl;
-     double muini=mu1;
-     double mqini=mql;
-     for(int i=0; i<4; i++){
-       if(decpar[i].nf!=0){
-         n+=1;
-       }
-     }
-     int zaehler=4;
-     while (zaehler!=0){
-       for(int i=0; i<zaehler-1; i++){
-         if(decpar[i].nf>decpar[i+1].nf){
-           help=decpar[i].nf;
-           decpar[i].nf=decpar[i+1].nf;
-           decpar[i+1].nf=help;
-           help2=decpar[i].Mth;
-           decpar[i].Mth=decpar[i+1].Mth;
-           decpar[i+1].Mth=help2;
-           help2=decpar[i].muth;
-           decpar[i].muth=decpar[i+1].muth;
-           decpar[i+1].muth=help2;
-         }
-       }
-       zaehler-=1;
-     }
-     for(int i=3-n+2;i<=3;i++){
-       if(decpar[i].nf-decpar[i-1].nf!=1){
-         cout<<"WARNING: THERE IS A GAP IN NUMBER OF FLAVOURS. EXIT.";
-         RETURN
-       }
-     }
-
-     double erg1,erg2,erg3, erg4, erg5, erg6;
-     int i;
-     for(i=3-n+1;i<=3;i++){
-       erg1= AlphasExact(asini, muini, decpar[i].muth,decpar[i].nf-1,nl);
-       erg3= mMS2mMS(mqini,asini,erg1,decpar[i].nf-1,nl);
-       erg2= DecAsUpOS(erg1,decpar[i].Mth,decpar[i].muth,decpar[i].nf-1,nl);
-       erg4=DecMqUpOS(erg3,erg1,decpar[i].Mth,decpar[i].muth,decpar[i].nf-1,nl);
-       asini=erg2;
-       mqini=erg4;
-       muini=decpar[i].muth;
-     }
-     erg5= AlphasExact(asini,muini,mu2,decpar[i-1].nf,nl);
-     erg6= mMS2mMS(mqini,asini,erg5,decpar[i-1].nf,nl);
-     for(int j=0;j<=3;j++){
-       decpar[j].nf=0;
-       decpar[j].Mth=0.;
-       decpar[j].muth=0.;
-     }
-     return erg6;
-}
-
-// Function double CRunDec::mH2mL(double mqh, double ash, double mu1,
-//                         TriplenfMmu decpar[], double mu2, int nl)
-double CRunDec::mH2mL(double mqh, double ash, double mu1, TriplenfMmu decpar[],
-                      double mu2, int nl){
-     int n=0;
-     int help;
-     double help2;
-     double asini=ash;
-     double muini=mu1;
-     double mqini=mqh;
-     for(int i=0; i<4; i++){
-       if(decpar[i].nf!=0){
-         n+=1;
-       }
-     }
-     int zaehler=4;
-     while (zaehler!=0){
-       for(int i=0; i<zaehler-1; i++){
-         if(decpar[i].nf<decpar[i+1].nf){
-           help=decpar[i].nf;
-           decpar[i].nf=decpar[i+1].nf;
-           decpar[i+1].nf=help;
-           help2=decpar[i].Mth;
-           decpar[i].Mth=decpar[i+1].Mth;
-           decpar[i+1].Mth=help2;
-           help2=decpar[i].muth;
-           decpar[i].muth=decpar[i+1].muth;
-           decpar[i+1].muth=help2;
-         }
-       }
-       zaehler-=1;
-     }
-     for(int i=1;i<=n-1;i++){
-       if(decpar[i].nf-decpar[i-1].nf!=-1){
-         cout<<"WARNING: THERE IS A GAP IN NUMBER OF FLAVOURS. EXIT.";
-         RETURN
-       }
-     }
-     double erg1,erg2,erg3,erg4,erg5,erg6;
-     int i;
-     for( i=0;i<=n-1;i++){
-       erg1= AlphasExact(asini, muini, decpar[i].muth,decpar[i].nf,nl);
-       erg3= mMS2mMS(mqini,asini,erg1,decpar[i].nf,nl);
-       erg2= DecAsDownOS(erg1,decpar[i].Mth,decpar[i].muth,decpar[i].nf-1,nl);
-       erg4=DecMqDownOS(erg3,erg1,decpar[i].Mth,decpar[i].muth,
-            decpar[i].nf-1,nl);
-       asini=erg2;
-       mqini=erg4;
-       muini=decpar[i].muth;
-     }
-     erg5= AlphasExact(asini,muini,mu2,decpar[i-1].nf-1,nl);
-     erg6 =mMS2mMS(mqini,asini,erg5,decpar[i-1].nf-1,nl);
-     for(int j=0;j<=3;j++){
-       decpar[j].nf=0;
-       decpar[j].Mth=0.;
-       decpar[j].muth=0.;
-     }
-     return erg6;
-}
-
-
-// In the following the functions above are overloaded w.r.t. to an
-// additional argument, n_f (number of active flavours).
-// Use SetConstants(nf)
-
-double CRunDec::LamExpl(double AlphaS, double Mu, int nf, int nl){
-     SetConstants(nf);
-     return (this->LamExpl(AlphaS, Mu, nl));
-}
-
-double CRunDec::LamImpl(double AlphaS, double Mu,int nf,int nl){
-     SetConstants(nf);
-     return (this->LamImpl(AlphaS, Mu, nl));
-}
-
-double CRunDec::AlphasLam(double Lambda, double Mu,int nf, int nl){
-     SetConstants(nf);
-     return (this->AlphasLam(Lambda, Mu, nl));
-}
-
-double CRunDec::AlphasExact(double AlphaS0, double Mu0, double MuEnd,
-                                int nf,int nl){
-     SetConstants(nf);
-     return (this->AlphasExact(AlphaS0,Mu0,MuEnd,nl));
-}
-
-double CRunDec::mMS2mMS(double mmu0, double AlphaSEnd, double AlphaS0,int nf,
-                           int nl){
-     SetConstants(nf);
-     return (this->mMS2mMS(mmu0, AlphaSEnd, AlphaS0, nl));
-}
-
-AsmMS CRunDec::AsmMSrunexact(double mMu, double AlphaS0, double Mu0,
-                              double MuEnd,int nf, int nl){
-     SetConstants(nf);
-     return (this->AsmMSrunexact(mMu, AlphaS0, Mu0, MuEnd, nl));
-}
-
-double CRunDec::mMS2mOS(double mMS, std::pair<double,double>* mq, double asmu, double mu,int nf,
-                           int nl, double fdelm){
-     SetConstants(nf);
-     return (this->mMS2mOS(mMS, mq, asmu, mu, nl, fdelm));
-}
-
-double CRunDec::mOS2mMS(double mOS, std::pair<double,double>* mq, double asmu, double Mu,int nf,
-                           int nl, double fdelm){
-     SetConstants(nf);
-     return (this->mOS2mMS(mOS, mq, asmu, Mu, nl, fdelm));
-}
-
-double CRunDec::mMS2mSI(double mMS, double asmu, double mu,int nf, int nl){
-     SetConstants(nf);
-     return (this->mMS2mSI(mMS, asmu, mu, nl));
-}
-
-double CRunDec::mRI2mMS(double mRI, double asmu,int nf, int nl){
-     SetConstants(nf);
-     return (this->mRI2mMS(mRI, asmu, nl));
-}
-
-double CRunDec::mMS2mRGI(double mMS, double asmu,int nf, int nl){
-     SetConstants(nf);
-     return (this->mMS2mRGI(mMS, asmu, nl));
-}
-
-double CRunDec::mRGI2mMS(double mRGI, double asmu,int nf, int nl){
-     SetConstants(nf);
-     return (this->mRGI2mMS(mRGI, asmu, nl));
-}
-
-double CRunDec::mOS2mSI(double mOS, std::pair<double,double>* mq, double asM,int nf, int nl, double fdelm){
-     SetConstants(nf);
-     return (this->mOS2mSI(mOS, mq, asM, nl, fdelm));
-}
-
-
-double CRunDec::mOS2mMSrun(double mOS, std::pair<double,double>* mq, double asmu, double mu,
-                              int nf, int nl){
-     SetConstants(nf);
-     return (this->mOS2mMSrun(mOS, mq, asmu, mu, nl));
-}
-
-double CRunDec::mMS2mOSrun(double mMS, std::pair<double,double>* mq, double asmu, double mu,
-                              int nf, int nl){
-     SetConstants(nf);
-     return (this->mMS2mOSrun(mMS, mq, asmu, mu, nl));
-}
-
-double CRunDec::mMS2mRI(double mMS, double asmu,int nf, int nl){
-     SetConstants(nf);
-     return (this->mMS2mRI(mMS, asmu, nl));
-}
-
-double CRunDec::mOS2mMSit(double mOS, std::pair<double,double>* mq, double asmu, double mu,
-                             int nf,int nl){
-     SetConstants(nf);
-     return (this->mOS2mMSit(mOS, mq, asmu, mu, nl));
-}
-
-double CRunDec::mMS2mRGImod(double mMS, double asmu,int nf, int nl){
-     SetConstants(nf);
-     return (this->mMS2mRGImod(mMS, asmu, nl));
-}
-
-
-double CRunDec::mOS2mRS(double mOS, std::pair<double,double>* mq, double asmu, double mu, double nuf, int nl, int nloops) {
-     return (this->mOS2mRS(mOS, mq, asmu, mu, nuf, nl, nloops, false));
-}
-
-double CRunDec::mOS2mRSp(double mOS, std::pair<double,double>* mq, double asmu, double mu, double nuf, int nl, int nloops) {
-     return (this->mOS2mRS(mOS, mq, asmu, mu, nuf, nl, nloops, true));
-}
-
-double CRunDec::mMS2mRS(double mMS, std::pair<double,double>* mq, double asmu, double mu, double nuf, int nl, int nloops, double fdelm) {
-     return (this->mMS2mRS(mMS, mq, asmu, mu, nuf, nl, nloops, fdelm, false));
-}
-
-double CRunDec::mMS2mRSp(double mMS, std::pair<double,double>* mq, double asmu, double mu, double nuf, int nl, int nloops, double fdelm) {
-     return (this->mMS2mRS(mMS, mq, asmu, mu, nuf, nl, nloops, fdelm, true));
-}
-
-double CRunDec::mRS2mMS(double mRS, std::pair<double,double>* mq, double asmu, double mu, double muf, int nl, int nloops, double fdelm) {
-     return (this->mRS2mMS(mRS, mq, asmu, mu, muf, nl, nloops, fdelm, false));
-}
-
-double CRunDec::mRSp2mMS(double mRS, std::pair<double,double>* mq, double asmu, double mu, double muf, int nl, int nloops, double fdelm) {
-     return (this->mRS2mMS(mRS, mq, asmu, mu, muf, nl, nloops, fdelm, true));
-}
-
-double CRunDec::mRS2mSI(double mRS, std::pair<double,double>* mq, double (*as)(double), double muf, int nl, int nloops, double fdelm) {
-     return (this->mRS2mSI(mRS, mq, as, muf, nl, nloops, fdelm, false));
-}
-
-double CRunDec::mRSp2mSI(double mRS, std::pair<double,double>* mq, double (*as)(double), double muf, int nl, int nloops, double fdelm) {
-     return (this->mRS2mSI(mRS, mq, as, muf, nl, nloops, fdelm, true));
-}
-
-double CRunDec::DecAsDownOS(double als, double massth, double muth,int nf,
-                               int nl){
-     SetConstants(nf);
-     return (this->DecAsDownOS(als, massth, muth, nl));
-}
-
-double CRunDec::DecAsUpOS(double als, double massth, double muth, int nf,
-                             int nl){
-     SetConstants(nf);
-     return (this->DecAsUpOS(als, massth, muth, nl));
-}
-
-double CRunDec::DecAsUpMS(double als, double massth, double muth, int nf,
-                             int nl){
-     SetConstants(nf);
-     return (this->DecAsUpMS(als, massth, muth, nl));
-}
-
-double CRunDec::DecAsDownMS(double als, double massth, double muth,int nf,
-                               int nl){
-     SetConstants(nf);
-     return (this->DecAsDownMS(als, massth, muth, nl));
-}
-
-double CRunDec::DecAsUpSI(double als, double massth, double muth, int nf,
-                             int nl){
-     SetConstants(nf);
-     return (this->DecAsUpSI(als, massth, muth, nl));
-}
-
-double CRunDec::DecAsDownSI(double als, double massth, double muth, int nf,
-                             int nl){
-     SetConstants(nf);
-     return (this->DecAsDownSI(als, massth, muth, nl));
-}
-
-double CRunDec::DecMqUpOS(double mq, double als, double massth, double muth,
-                             int nf, int nl){
-     SetConstants(nf);
-     return (this->DecMqUpOS(mq, als, massth, muth, nl));
-}
-
-double CRunDec::DecMqDownOS(double mq, double als, double massth,
-                               double muth,int nf, int nl){
-     SetConstants(nf);
-     return (this->DecMqDownOS(mq, als, massth, muth, nl));
-}
-
-double CRunDec::DecMqUpMS(double mq, double als, double massth, double muth,
-                             int nf, int nl){
-     SetConstants(nf);
-     return (this->DecMqUpMS(mq, als, massth, muth, nl));
-}
-
-double CRunDec::DecMqDownMS(double mq, double als, double massth,
-                               double muth,int nf, int nl){
-     SetConstants(nf);
-     return (this->DecMqDownMS(mq, als, massth, muth, nl));
-}
-
-double CRunDec::DecMqUpSI(double mq, double als, double massth, double muth,
-                             int nf, int nl){
-     SetConstants(nf);
-     return (this->DecMqUpSI(mq, als, massth, muth, nl));
-}
-
-double CRunDec::DecMqDownSI(double mq, double als, double massth,
-                               double muth,int nf, int nl){
-     SetConstants(nf);
-     return (this->DecMqDownSI(mq, als, massth, muth, nl));
-}
diff --git a/CRunDec3/CRunDec.3.0.h b/CRunDec3/CRunDec.3.0.h
deleted file mode 100644
index 95269b5..0000000
--- a/CRunDec3/CRunDec.3.0.h
+++ /dev/null
@@ -1,1017 +0,0 @@
-/*
-  CRunDec.h
-
-  Header file for CRunDec.cpp
-
-  Author: Barbara Schmidt (Jan 2012)
-          Florian Herren and Matthias Steinhauser (Jan 2016)
-*/
-
-/*
-  Minor update: (Sep 2016)
-  Remove "static" from definition and initialization of constants for Runge-Kutta procedure.
-  The C++11 standard supports the new version, so a C++11 compliant compiler and maybe
-  the switch "-std=c++11" should be used.
-*/
-
-/*
-License:
-
-CRunDec is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef CRUNDEC_H_
-#define CRUNDEC_H_
-
-#include <utility>
-
-// Default return statement:
-#define RETURN return(0);
-// The following might be useful for Windows:
-//#define RETURN   system("PAUSE"); exit(1);
-
-
-// Numerical values for input parameters:
-static struct RunDec_values {
-    double asMz    = 0.1181;
-    double asMtau  = 0.332;
-    double Mz      = 91.1876;
-    double Mh      = 125.09;
-    double muc     = 1.279;
-    double mc3     = 0.986;
-    double mub     = 4.163;
-    double Mtau    = 1.77686;
-    double Mc      = 1.5;
-    double Mb      = 4.8;
-    double Mt      = 173.21;
-} NumDef;
-
-
-
-
-// Struct for triple {nf, Mth, Muth}:
-
-//! Structure containing: the number of light flavours (nf), the mass of the heavy quark (Mth) and the decoupling scale (muth)
-/*!
-  This structure is used to pass information on decoupling thresholds to AlH2AlL, AlL2AlH, mH2mL and mL2mH.
-*/
-struct TriplenfMmu{
-    int nf;
-    double Mth;
-    double muth;
-};
-
-
-//! Structure containing: \f$\alpha_s^{(n_f)}\f$ (Asexact) and \f$m_{MS}^{(n_f)}\f$ (mMSexact)
-/*!
-  This structure is used to return the results of AsmMsexact.
-*/  
-struct AsmMS{
-    double Asexact;
-    double mMSexact;
-};
-
-// class declaration of CRunDec:
-
-//! Main class, contains all functions
-/*!
-  All RunDec functions are accessed via this class.
-  For many of the functions versions with and without the parameters nl/nf exist. 
-  The ones with the parameters nl/nf call the ones without after calling SetNf(nl)/SetNf(nf). It is
-  recommended not to use the ones without nl/nf since some of them change the values of nl/nf during their execution.
-
-  Detailed descriptions are only provided for the the functions
-  with parameters nl/nf.    
-*/
-class CRunDec
-{
-private: 
-    // Aux. constants for implicit Runge-Kutta-Procedure:
-    double a2=0.2, a3=0.3, a4=0.6, a5=1., a6=0.875;
-       
-    double b21=0.2, b31=3./40., b32=9./40., b41=0.3, b42=-0.9, 
-                 b43=6./5.;
-    double b51=-11./54., b52=2.5, b53=-70./27., b54=35./27.;
-    double b61=1631./55296., b62=175./512., b63=575./13824.;
-    double b64=44275./110592., b65=253./4096.;
-       
-    double c1=37./378., c2=0., c3=250./621., c4=125./594., c5=0.;
-    double c6= 512./1771.;
-       
-    double dc1=37./378.-2825./27648., dc2=0.-0., 
-                 dc3=250./621.-18575./48384.;
-    double dc4=125./594.-13525./55296., dc5=0.-277./14336., 
-                 dc6=512./1771.-0.25;
-  
-    // Coefficients for diff. equations:
-    double Beta[5], B[5], Betap[5], Bp[5], Gamma[5], C[5], Nf;
-
-    // Define constants (if not already done with constructor):
-    void SetConstants(int n);
-  
-    // R.h.s. of diff. equations:
-    friend double fSetdydx(CRunDec S, double A, int nl);
-  
-    friend double fSetdydxa1(CRunDec S, double x, double A);
-    friend double fSetdydxM1(CRunDec S, double A, double M);
-
-    friend double fSetdydxa2(CRunDec S, double x, double A);
-    friend double fSetdydxM2(CRunDec S, double A, double M);
-
-    friend double fSetdydxa3(CRunDec S, double x, double A);
-    friend double fSetdydxM3(CRunDec S, double A, double M);
-  
-    friend double fSetdydxa4(CRunDec S, double x, double A);
-    friend double fSetdydxM4(CRunDec S, double A, double M);
-
-    friend double fSetdydxa5(CRunDec S, double x, double A);
-    friend double fSetdydxM5(CRunDec S, double A, double M);
-  
-    // Additional aux. functions:
-    int Abbruch(void);
-    double fSetAsL(double Lambda, double Mu, int nl, double AlphaS);
-    double fSetcx(double x, int nl);
-    double fOsFromMs1(double mu, double M);
-    double fOsFromMs2(double mu, double M, double nl);
-    double fOsFromMs3(double mu, double M, double nl);
-    double fOsFromMs4(double mu, double M, double nl, double err);
-    double fMsFromOs1(double mu, double M);
-    double fMsFromOs2(double mu, double M, double nl);
-    double fMsFromOs3(double mu, double M, double nl);
-    double fMsFromOs4(double mu, double M, double nl, double err);
-    double fZmM(double n);
-    double fZmInvM(double n);
-    double deltamOS2mMS(double mOS, std::pair<double,double>* mq,
-                        double asmu, double mu, int nlq, int nloops); 
-    double deltamMS2mOS(double mMS, std::pair<double,double>* mq,
-                        double asmu, double mu, int nlq, int nloops); 
-    double fMsFromRi1(void);
-    double fMsFromRi2(void);
-    double fMsFromRi3(void);
-    double fMumFromOs1(void);
-    double fMumFromOs2(void);
-    double fMumFromOs3(void);
-    double fMumFromOs4(double err);
-    double fRiFromMs(double alpha, double nl);
-    double fMsFromRi(double alpha, double nl);
-    double fHelpmOS2mMSit(double mMS,double mOS, std::pair<double,double>* mq,
-                          double asmu, double mu, int nl);
-    double fas5to6os(double alpha, double mass, double mu, double nlq, double nl);
-    double fas6to5os(double alpha, double mass, double mu, double nlq, double nl);
-    double fas5to6ms(double alpha, double mass, double mu, double nlq, double nl);
-    double fas6to5ms(double alpha, double mass, double mu, double nlq, double nl);
-    double fas6to5si(double alpha, double mass, double mu, double nlq, double nl);
-    double fas5to6si(double alpha, double mass, double mu, double nlq, double nl);
-    double fmq5to6os(double A, double mass, double mu, double nlq, double nl);
-    double fmq6to5os(double A, double mass, double mu, double nlq, double nl);
-    double fmq5to6ms(double A, double mass, double mu, double nlq, double nl);
-    double fmq6to5ms(double A, double mass, double mu, double nlq, double nl);
-    double fmq5to6si(double A, double mass, double mu, double nlq, double nl);
-    double fmq6to5si(double A, double mass, double mu, double nlq, double nl);
-
-    double PSdelta(double asmu, double muf, double mu, int nl, int nloops);
-    double E1p(double mOS, double asmu, double mu, int nl, int nloops);
-    double exOS2RS(double api, double mmu, double nnuf, int nnl, int nloops);
-    double exOS2RSp(double api, double mmu, double nnuf, int nnl, int nloops);
-    double mMS2mOSmod(double mMS, std::pair<double,double>* mq,
-                      double asmu, double mu, int nf, int nloops, double err);
-  
-    double fRungeKuttaImpl(double &x, double y, double &htry, int nl, 
-                           double (*f)(CRunDec, double, int));
-    double fRKSchritt(double x, double y, double h, double &yerr,
-                      double (*f)(CRunDec, double, double));
-    double PolyLog(unsigned int n, double x);
-
-     
-public:
-    // constructor:
-    CRunDec();
-    CRunDec(int);
-  
-    // Arrays and structs to store data:
-    std::pair<double,double> mq[4];
-    TriplenfMmu nfMmu[4];
-    AsmMS AM;
-  
-
-    //! GetNf returns the number of light flavours currently in use
-    /*!
-        \return \f$n_f\f$
-    */
-    int GetNf();
-
-    //! SetNf sets the number of light flavours
-    /*!
-        \param nf \f$n_f\f$
-    */
-    void SetNf(int nf);
-
-    // Functions for the running of alpha_s and m_q:
-
-    //! LamExpl calculates \f$\Lambda^{(n_f)}\f$ from \f$\alpha_s^{(n_f)}\f$ explicitly solving for \f$\Lambda^{(n_f)}\f$
-    /*!
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$\Lambda^{(n_f)}\f$
-    */
-    double LamExpl(double asmu, double mu, int nf, int nloops);
-
-    //! LamImpl calculates \f$\Lambda^{(n_f)}\f$ from \f$\alpha_s^{(n_f)}\f$ implicitly solving for \f$\Lambda^{(n_f)}\f$
-    /*!
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$\Lambda^{(n_f)}\f$
-    */
-    double LamImpl(double asmu, double mu,int nf,int nloops);
-
-    //! AlphasLam calculates \f$\alpha_s^{(n_f)}\f$ from \f$\Lambda^{(n_f)}\f$
-    /*!
-        \param Lambda \f$\Lambda^{(n_f)}\f$
-        \param mu \f$\mu\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$\alpha_s^{(n_f)}(\mu)\f$
-    */
-    double AlphasLam(double Lambda, double mu,int nf, int nloops);
-
-    //! AlphasExact calculates \f$\alpha_s^{(n_f)}(\mu_1)\f$ from \f$\alpha_s^{(n_f)}(\mu_0)\f$
-    /*!
-        \param asmu0 \f$\alpha_s^{(n_f)}(\mu_0)\f$
-        \param mu0 \f$\mu_0\f$
-        \param mu1 \f$\mu_1\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$\alpha_s^{(n_f)}(\mu_1)\f$
-    */
-    double AlphasExact(double asmu0, double mu0, double mu1, int nf,int nloops);
-
-    //! mMS2mMS calculates \f$m_{MS}^{(n_f}(\mu_1)\f$ from \f$m_{MS}^{(n_f)}(\mu_0)\f$
-    /*!
-        \param mu0 \f$m_{MS}^{(n_f)}(\mu_0)\f$
-        \param asmu0 \f$\alpha_s^{(n_f)}(\mu_0)\f$
-        \param asmu1 \f$\alpha_s^{(n_f)}(\mu_1)\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$m_{MS}^{(n_f)}(\mu_1)\f$
-    */
-    double mMS2mMS(double mu0, double asmu1, double asmu0,int nf, int nloops);
-
-    //! AsmMSrunexact solves simultaneously the differential equations for \f$\alpha_s^{(n_f)}\f$ and \f$m_{MS}^{(n_f)}\f$
-
-    //! Returns a structure of type AsmMS.
-    /*!
-        \param mmu \f$m_{MS}^{(n_f)}(\mu_0)\f$
-        \param asmu0 \f$\alpha_s^{(n_f)}(\mu_0)\f$
-        \param mu0 \f$\mu_0\f$
-        \param mu1 \f$\mu_1\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$(\alpha_s^{(n_f)}(\mu_1),m_{MS}^{(n_f)}(\mu_1))\f$
-    */
-    AsmMS AsmMSrunexact(double mmu, double asmu0, double mu0, double mu1,
-                        int nf, int nloops);
-
-    // Decoupling relations:
-    //! DecLambdaUp calculates \f$\Lambda^{(n_l+1)}\f$ from \f$\Lambda^{(n_l)}\f$
-    /*!
-        \param lam \f$\Lambda^{(n_l)}\f$
-        \param massth quark mass at which the matching is performed (\f$m_{MS}^{(n_l+1)}(m_{MS})\f$)
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$\Lambda^{(n_l+1)}\f$
-    */
-    double DecLambdaUp(double lam, double massth, int nl, int nloops);
-
-    //! DecLambdaDown calculates \f$\Lambda^{(n_l)}\f$ from \f$\Lambda^{(n_l+1)}\f$
-    /*!
-        \param lam \f$\Lambda^{(n_l+1)}\f$
-        \param massth quark mass at which the matching is performed (\f$m_{MS}^{(n_l+1)}(m_{MS})\f$)
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$\Lambda^{(n_l)}\f$
-    */
-    double DecLambdaDown(double lam, double massth, int nl, int nloops);
-
-
-    //! DecAsDownOS calculates \f$\alpha_s^{(n_l)}\f$ from \f$\alpha_s^{(n_l+1)}\f$
-    /*!
-        \param asmu \f$\alpha_s^{(n_l+1)}(\mu)\f$
-        \param massth mass of the heavy quark (\f$M_{OS}\f$)
-        \param muth scale \f$\mu\f$ at which the matching is performed
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$\alpha_s^{(n_l)}(\mu)\f$
-    */
-    double DecAsDownOS(double asmu, double massth, double muth, int nl, int nloops);
-
-    //! DecAsUpOS calculates \f$\alpha_s^{(n_l+1)}\f$ from \f$\alpha_s^{(n_l)}\f$
-    /*!
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param massth mass of the heavy quark (\f$M_{OS}\f$)
-        \param muth scale \f$\mu\f$ at which the matching is performed
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$\alpha_s^{(n_l+1)}(\mu)\f$
-    */
-    double DecAsUpOS(double asmu, double massth, double muth, int nl, int nloops);
-
-    //! DecAsDownMS calculates \f$\alpha_s^{(n_l)}\f$ from \f$\alpha_s^{(n_l+1)}\f$
-    /*!
-        \param asmu \f$\alpha_s^{(n_l+1)}(\mu)\f$
-        \param massth mass of the heavy quark (\f$m_{MS}^{(n_l+1)}(\mu)\f$)
-        \param muth scale \f$\mu\f$ at which the matching is performed
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$\alpha_s^{(n_l)}(\mu)\f$
-    */
-    double DecAsDownMS(double asmu, double massth, double muth, int nl, int nloops);
-
-    //! DecAsUpMS calculates \f$\alpha_s^{(n_l+1)}\f$ from \f$\alpha_s^{(n_l)}\f$
-    /*!
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param massth mass of the heavy quark (\f$m_{MS}^{(n_l+1)}(\mu)\f$)
-        \param muth scale \f$\mu\f$ at which the matching is performed
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$\alpha_s^{(n_l+1)}(\mu)\f$
-    */
-    double DecAsUpMS(double asmu, double massth, double muth, int nl, int nloops);
-
-    //! DecAsDownSI calculates \f$\alpha_s^{(n_l)}\f$ from \f$\alpha_s^{(n_l+1)}\f$
-    /*!
-        \param asmu \f$\alpha_s^{(n_l+1)}(\mu)\f$
-        \param massth mass of the heavy quark (\f$m_{MS}^{(n_l+1)}(m_{MS})\f$)
-        \param muth scale \f$\mu\f$ at which the matching is performed
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$\alpha_s^{(n_l)}(\mu)\f$
-    */
-    double DecAsDownSI(double asmu, double massth, double muth, int nl, int nloops);
-
-    //! DecAsUpSI calculates \f$\alpha_s^{(n_l+1)}\f$ from \f$\alpha_s^{(n_l)}\f$
-    /*!
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param massth mass of the heavy quark (\f$m_{MS}^{(n_l+1)}(m_{MS})\f$)
-        \param muth scale \f$\mu\f$ at which the matching is performed
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$\alpha_s^{(n_l+1)}(\mu)\f$
-    */
-    double DecAsUpSI(double asmu, double massth, double muth, int nl, int nloops);
-
-    //! DecMqUpOS calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m_{MS}^{(n_l)}(\mu)\f$
-    /*!
-        \param mq \f$m_{MS}^{(n_l)}(\mu)\f$
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param massth mass of the heavy quark (\f$M_{OS}\f$)
-        \param muth scale \f$\mu\f$ at which the matching is performed
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    */
-    double DecMqUpOS(double mq, double asmu, double massth, double muth, int nl,
-                     int nloops);
-
-    //! DecMqDownOS calculates \f$m_{MS}^{(n_l)}(\mu)\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    /*!
-        \param mq \f$m_{MS}^{(n_l+1)}(\mu)\f$
-        \param asmu \f$\alpha_s^{(n_l+1)}(\mu)\f$
-        \param massth mass of the heavy quark (\f$M_{OS}\f$)
-        \param muth scale \f$\mu\f$ at which the matching is performed
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$m_{MS}^{(n_l)}(\mu)\f$
-    */
-    double DecMqDownOS(double mq, double asmu, double massth, double muth, int nl,
-                       int nloops);
-
-    //! DecMqUpMS calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m_{MS}^{(n_l)}(\mu)\f$
-    /*!
-        \param mq \f$m_{MS}^{(n_l)}(\mu)\f$
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param massth mass of the heavy quark (\f$m_{MS}^{(n_l+1)}(\mu)\f$)
-        \param muth scale \f$\mu\f$ at which the matching is performed
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    */
-    double DecMqUpMS(double mq, double asmu, double massth, double muth, int nl,
-                     int nloops);
-
-    //! DecMqDownMS calculates \f$m_{MS}^{(n_l)}(\mu)\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    /*!
-        \param mq \f$m_{MS}^{(n_l+1)}(\mu)\f$
-        \param asmu \f$\alpha_s^{(n_l+1)}(\mu)\f$
-        \param massth mass of the heavy quark (\f$m_{MS}^{(n_l+1)}(\mu)\f$)
-        \param muth scale \f$\mu\f$ at which the matching is performed
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$m_{MS}^{(n_l)}(\mu)\f$
-    */
-    double DecMqDownMS(double mq, double asmu, double massth, double muth, int nl,
-                       int nloops);
-
-    //! DecMqUpSI calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m_{MS}^{(n_l)}(\mu)\f$
-    /*!
-        \param mq \f$m_{MS}^{(n_l)}(\mu)\f$
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param massth mass of the heavy quark (\f$m_{MS}^{(n_l+1)}(m_{MS})\f$)
-        \param muth scale \f$\mu\f$ at which the matching is performed
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    */
-    double DecMqUpSI(double mq, double asmu, double massth, double muth, int nl,
-                     int nloops);
-
-    //! DecMqDownSI calculates \f$m_{MS}^{(n_l)}(\mu)\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    /*!
-        \param mq \f$m_{MS}^{(n_l+1)}(\mu)\f$
-        \param asmu \f$\alpha_s^{(n_l+1)}(\mu)\f$
-        \param massth mass of the heavy quark (\f$m_{MS}^{(n_l+1)}(m_{MS})\f$)
-        \param muth scale \f$\mu\f$ at which the matching is performed
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$m_{MS}^{(n_l)}(\mu)\f$
-    */
-    double DecMqDownSI(double mq, double asmu, double massth, double muth, int nl,
-                       int nloops);
-
-    // Running and decoupling:
-
-    //! AlL2AlH calculates \f$\alpha_s(\mu_2)\f$ from \f$\alpha_s(\mu_1)\f$ decoupling at intermediate scales, running from low to high
-    /*!
-        \param asl \f$\alpha_s(\mu_1)\f$
-        \param mu1 \f$\mu_1\f$
-        \param decpar arrays of triples indicating the number of flavours, the OS-mass and the scale at which decoupling is performed
-        \param mu2 \f$\mu_2\f$
-        \param nloops number of loops
-        \return \f$\alpha_s(\mu_2)\f$
-    */
-    double AlL2AlH(double asl, double mu1, TriplenfMmu decpar[], double mu2, int nloops);
-
-    //! AlH2AlL calculates \f$\alpha_s(\mu_2)\f$ from \f$\alpha_s(\mu_1)\f$ decoupling at intermediate scales, running from high to low
-    /*!
-        \param ash \f$\alpha_s(\mu_1)\f$
-        \param mu1 \f$\mu_1\f$
-        \param decpar arrays of triples indicating the number of flavours, the OS-mass and the scale at which decoupling is performed
-        \param mu2 \f$\mu_2\f$
-        \param nloops number of loops
-        \return \f$\alpha_s(\mu_2)\f$
-    */
-    double AlH2AlL(double ash, double mu1, TriplenfMmu decpar[], double mu2, int nloops);
-
-    //! mL2mH calculates \f$m_{MS}(\mu_2)\f$ from \f$m_{MS}(\mu_1)\f$ decoupling at intermediate scales, running from low to high
-    /*!
-        \param mql \f$m_{MS}(\mu_1)\f$
-        \param asl \f$\alpha_s(\mu_1)\f$
-        \param mu1 \f$\mu_1\f$
-        \param decpar arrays of triples indicating the number of flavours, the OS-mass and the scale at which decoupling is performed
-        \param mu2 \f$\mu_2\f$
-        \param nloops number of loops
-        \return \f$m_{MS}(\mu_2)\f$
-    */
-    double mL2mH(double mql, double asl, double mu1, TriplenfMmu decpar[], double mu2,
-                 int nloops);
-
-    //! mH2mL calculates \f$m_{MS}(\mu_2)\f$ from \f$m_{MS}(\mu_1)\f$ decoupling at intermediate scales, running from high to low
-    /*!
-        \param mqh \f$m_{MS}(\mu_1)\f$
-        \param ash \f$\alpha_s(\mu_1)\f$
-        \param mu1 \f$\mu_1\f$
-        \param decpar arrays of triples indicating the number of flavours, the OS-mass and the scale at which decoupling is performed
-        \param mu2 \f$\mu_2\f$
-        \param nloops number of loops
-        \return \f$m_{MS}(\mu_2)\f$
-    */
-    double mH2mL(double mqh, double ash, double mu1, TriplenfMmu decpar[], double mu2,
-                 int nloops);
-  
-    // Mass relations
-    
-    //! mMS2mOS calculates \f$M_{OS}\f$ from \f$m_{MS}^{(n_f)}(\mu)\f$
-    /*!
-        \param mMS \f$m_{MS}^{(n_f)}(\mu)\f$
-        \param mq pointer to pairs of light quark masses
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$M_{OS}\f$
-    */
-
-    double mMS2mOS(double mMS, std::pair<double,double>* mq,
-                   double asmu, double mu,int nf, int nloops, double fdelm=1.0);
-
-    //! mOS2mMS calculates \f$m_{MS}^{(n_f)}(\mu)\f$ from \f$M_{OS}\f$
-    /*!
-        \param mOS \f$M_{OS}\f$
-        \param mq pointer to pairs of light quark masses
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m_{MS}^{(n_f)}(\mu)\f$
-    */
-    double mOS2mMS(double mOS, std::pair<double,double>* mq,
-                   double asmu, double mu,int nf, int nloops, double fdelm=1.0);
-
-    //! mMS2mSI calculates \f$m_{MS}^{(n_f)}(m_{MS})\f$ from \f$m_{MS}^{(n_f)}(\mu)\f$
-    /*!
-        \param mMS \f$m_{MS}^{(n_f)}(\mu)\f$
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$m_{MS}^{(n_f)}(m_{MS})\f$
-    */
-    double mMS2mSI(double mMS, double asmu, double mu, int nf, int nloops);
-
-    //! mRI2mMS calculates \f$m_{MS}^{(n_f)}(\mu)\f$ from \f$m^{RI}(\mu)\f$
-    /*!
-        \param mRI \f$m^{RI}(\mu)\f$
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$m_{MS}^{(n_f)}(\mu)\f$
-    */
-    double mRI2mMS(double mRI, double asmu, int nf, int nloops);
-
-    //! mMS2mRGI calculates \f$m^{RGI}\f$ from \f$m_{MS}^{(n_f)}(\mu)\f$
-
-    //! for the difference between mMS2mRGImod and mMS2mRGI see arXiv:1201:6149
-    /*!
-        \param mMS \f$m_{MS}^{(n_f)}(\mu)\f$
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$m^{RGI}\f$
-    */
-    double mMS2mRGI(double mMS, double asmu, int nf, int nloops);
-
-    //! mRGI2mMS calculates \f$m_{MS}^{(n_f)}(\mu)\f$ from \f$m^{RGI}\f$
-    /*!
-        \param mRGI \f$m^{RGI}\f$
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$m_{MS}^{(n_f)}(\mu)\f$
-    */
-    double mRGI2mMS(double mRGI, double asmu, int nf, int nloops);
-
-    //! mOS2mSI calculates \f$m_{MS}^{(n_f)}(m_{MS})\f$ from \f$M_{OS}\f$
-    /*!
-        \param mOS \f$M_{OS}\f$
-        \param mq pointer to pairs of light quark masses
-        \param asM \f$\alpha_s^{(n_f)}(M_{OS})\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m_{MS}^{(n_f)}(m_{MS})\f$
-    */
-    double mOS2mSI(double mOS, std::pair<double,double>* mq,
-                   double asM, int nf, int nloops, double fdelm=1.0);
-
-    //! mOS2mMSrun calculates \f$m_{MS}^{(n_f)}(\mu)\f$ from \f$M_{OS}\f$
-
-    //! Calculates \f$m_{MS}^{(n_f)}(m_{MS})\f$ in an intermediate step
-    /*!
-        \param mOS \f$M_{OS}\f$
-        \param mq pointer to pairs of light quark masses
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$m_{MS}^{(n_f)}(\mu)\f$
-    */ 
-    double mOS2mMSrun(double mOS, std::pair<double,double>* mq,
-                      double asmu, double mu,int nf, int nloops);
-
-    //! mMS2mOSrun calculates \f$M_{OS}\f$ from \f$m_{MS}^{(n_f)}(\mu)\f$
-
-    //! Calculates \f$m_{MS}^{(n_f)}(m_{MS})\f$ in an intermediate step
-    /*!
-        \param mMS \f$m_{MS}^{(n_f)}(\mu)\f$
-        \param mq pointer to pairs of light quark masses
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$M_{OS}\f$
-    */  
-    double mMS2mOSrun(double mMS, std::pair<double,double>* mq,
-                      double asmu, double mu,int nf, int nloops);
-
-    //! mMS2mRI calculates \f$m^{RI}(\mu)\f$ from \f$m_{MS}^{(n_f)}(\mu)\f$
-    /*!
-        \param mMS \f$m_{MS}^{(n_f)}(\mu)\f$
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$m^{RI}(\mu)\f$
-    */  
-    double mMS2mRI(double mMS, double asmu,int nf, int nloops);
-
-    //! mOS2mMSit calculates \f$m_{MS}^{(n_f)}(\mu)\f$ from \f$M_{OS}\f$
-
-    //! DEPRECATED, will be removed in future versions
-    /*!
-        \param mOS \f$M_{OS}\f$
-        \param mq pointer to pairs of light quark masses
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$m_{MS}^{(n_f)}(\mu)\f$
-    */  
-    double mOS2mMSit(double mOS, std::pair<double,double>* mq,
-                     double asmu, double mu, int nf, int nloops);
-
-    //! mMS2mRGImod calculates \f$m^{RGI}\f$ from \f$m_{MS}^{(n_f)}(\mu)\f$
-
-    //! for the difference between mMS2mRGImod and mMS2mRGI see arXiv:1201:6149
-    /*!
-        \param mMS \f$m_{MS}^{(n_f)}(\mu)\f$
-        \param asmu \f$\alpha_s^{(n_f)}(\mu)\f$
-        \param nf \f$n_f\f$
-        \param nloops number of loops
-        \return \f$m^{RGI}\f$
-    */
-    double mMS2mRGImod(double mMS, double asmu, int nf, int nloops);
-
-    //! mOS2mPS calculates \f$m^{PS}(\mu_f)\f$ from \f$M_{OS}\f$
-    /*!
-        \param mOS \f$M_{OS}\f$
-
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param muf \f$\mu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$m^{PS}(\mu_f)\f$
-    */ 
-    double mOS2mPS(double mOS, std::pair<double,double>* mq,
-                   double asmu, double mu, double muf, int nl, int nloops);
-
-    //! mMS2mPS calculates \f$m^{PS}(\mu_f)\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    /*!
-        \param mMS \f$m_{MS}^{(n_l+1)}(\mu)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param muf \f$\mu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m^{PS}(\mu_f)\f$
-    */
-    double mMS2mPS(double mMS, std::pair<double,double>* mq,
-                   double asmu, double mu, double muf, int nl, int nloops, double fdelm=1.0);
-
-    //! mPS2mMS calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m^{PS}(\mu_f)\f$
-    /*!
-        \param mPS \f$m^{PS}(\mu_f)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param muf \f$\mu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    */
-    double mPS2mMS(double mPS, std::pair<double,double>* mq,
-                   double asmu, double mu, double muf, int nl, int nloops, double fdelm=1.0);
-
-    //! mPS2mSI calculates \f$m_{MS}^{(n_l+1)}(m_{MS})\f$ from \f$m^{PS}(\mu_f)\f$
-    /*!
-        \param mPS \f$m^{PS}(\mu_f)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param as pointer to a function which calculates \f$\alpha_s^{(n_l)}(\mu)\f$ and takes \f$\mu\f$ as argument
-        \param muf \f$\mu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m_{MS}^{(n_l+1)}(m_{MS})\f$
-    */
-    double mPS2mSI(double mPS, std::pair<double,double>* mq,
-                   double (*as)(double), double muf, int nl, int nloops, double fdelm=1.0);
-
-    //! mOS2m1S calculates \f$m^{1S}\f$ from \f$M_{OS}\f$
-    /*!
-        \param mOS \f$M_{OS}\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$m^{1S}\f$
-    */ 
-    double mOS2m1S(double mOS, std::pair<double,double>* mq,
-                   double asmu, double mu, int nl, int nloops);
-
-    //! mMS2m1S calculates \f$m^{1S}\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    /*!
-        \param mMS \f$m_{MS}^{(n_l+1)}(\mu)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m^{1S}\f$
-    */
-    double mMS2m1S(double mMS, std::pair<double,double>* mq,
-                   double asmu, double mu, int nl, int nloops, double fdelm=1.0);
-
-    //! m1S2mMS calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m^{1S}\f$
-    /*!
-        \param m1S \f$m^{PS}\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    */
-    double m1S2mMS(double m1S, std::pair<double,double>* mq,
-                   double asmu, double mu, int nl, int nloops, double fdelm=1.0);
-
-    //! m1S2mSI calculates \f$m_{MS}^{(n_l+1)}(m_{MS})\f$ from \f$m^{1S}\f$
-    /*!
-        \param m1S \f$m^{1S}\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param as pointer to a function which calculates \f$\alpha_s^{(n_l)}(\mu)\f$ and takes \f$\mu\f$ as argument
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m_{MS}^{(n_l+1)}(m_{MS})\f$
-    */
-    double m1S2mSI(double m1S, std::pair<double,double>* mq,
-                   double (*as)(double), int nl, int nloops, double fdelm=1.0);
-
-    //! mOS2mRS calculates \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$ from \f$M_{OS}\f$
-
-    //! This is a helper function, use the version without the parameter prime or mOS2mRSp
-    /*!
-        \param mOS \f$M_{OS}\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nuf \f$\nu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param prime selects if \f$m^{RS}\f$ or \f$m^{RS'}\f$ should be calculated
-        \return \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$
-    */ 
-    double mOS2mRS(double mOS, std::pair<double,double>* mq, double asmu,
-                   double mu, double nuf, int nl, int nloops, bool prime);
-
-    //! mMS2mRS calculates \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
-
-    //! This is a helper function, use the version without the parameter prime or mMS2mRSp
-    /*!
-        \param mMS \f$m_{MS}^{(n_l+1)}(\mu)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nuf \f$\nu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \param prime selects if \f$m^{RS}\f$ or \f$m^{RS'}\f$ should be calculated
-        \return \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$
-    */ 
-    double mMS2mRS(double mMS, std::pair<double,double>* mq, double asmu,
-                   double mu, double nuf, int nl, int nloops, double fdelm, bool prime);
-
-    //! mRS2mMS calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$
-
-    //! This is a helper function, use the version without the parameter prime or mRSp2mMS
-    /*!
-        \param mRS \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nuf \f$\nu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \param prime selects if \f$m^{RS}\f$ or \f$m^{RS'}\f$ is given
-        \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    */ 
-    double mRS2mMS(double mRS, std::pair<double,double>* mq, double asmu,
-                   double mu, double nuf, int nl, int nloops, double fdelm, bool prime);
-
-    //! mRS2mSI calculates \f$m_{MS}^{(n_l+1)}(m_{MS})\f$ from \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$
-
-    //! This is a helper function, use the version without the parameter prime or mRSp2mSI
-    /*!
-        \param mRS \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param as pointer to a function which calculates \f$\alpha_s^{(n_l)}(\mu)\f$ and takes \f$\mu\f$ as argument
-        \param nuf \f$\nu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \param prime selects if \f$m^{RS}\f$ or \f$m^{RS'}\f$ is given
-        \return \f$m_{MS}^{(n_l+1)}(m_{MS})\f$
-    */
-    double mRS2mSI(double mRS, std::pair<double,double>* mq, double (*as)(double),
-                   double nuf, int nl, int nloops, double fdelm, bool prime);
-
-
-    //! mOS2mRS calculates \f$m^{RS}(\nu_f)\f$ from \f$M_{OS}\f$
-
-    /*!
-        \param mOS \f$M_{OS}\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nuf \f$\nu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$m^{RS}(\nu_f)\f$
-    */ 
-    double mOS2mRS(double mOS, std::pair<double,double>* mq,
-                   double asmu, double mu, double nuf, int nl, int nloops);
-
-    //! mMS2mRS calculates \f$m^{RS}(\nu_f)\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
-
-    /*!
-        \param mMS \f$m_{MS}^{(n_l+1)}(\mu)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nuf \f$\nu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m^{RS}(\nu_f)\f$
-    */ 
-    double mMS2mRS(double mMS, std::pair<double,double>* mq,
-                   double asmu, double mu, double nuf, int nl, int nloops, double fdelm=1.0);
-
-    //! mRS2mMS calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m^{RS}(\nu_f)\f$
-
-    /*!
-        \param mRS \f$m^{RS}(\nu_f)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nuf \f$\nu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    */ 
-    double mRS2mMS(double mRS, std::pair<double,double>* mq,
-                   double asmu, double mu, double nuf, int nl, int nloops, double fdelm=1.0);
-
-    //! mRS2mSI calculates \f$m_{MS}^{(n_l+1)}(m_{MS})\f$ from \f$m^{RS}(\nu_f)\f$
-
-    /*!
-        \param mRS \f$m^{RS}(\nu_f)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param as pointer to a function which calculates \f$\alpha_s^{(n_l)}(\mu)\f$ and takes \f$\mu\f$ as argument
-        \param nuf \f$\nu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m_{MS}^{(n_l+1)}(m_{MS})\f$
-    */
-    double mRS2mSI(double mRS, std::pair<double,double>* mq,
-                   double (*as)(double), double nuf, int nl, int nloops, double fdelm=1.0);
-
-    //! mOS2mRSp calculates \f$m^{RS'}(\nu_f)\f$ from \f$M_{OS}\f$
-
-    /*!
-        \param mOS \f$M_{OS}\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nuf \f$\nu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \return \f$m^{RS'}(\nu_f)\f$
-    */ 
-    double mOS2mRSp(double mOS, std::pair<double,double>* mq,
-                    double asmu, double mu, double nuf, int nl, int nloops);
-
-    //! mMS2mRSp calculates \f$m^{RS'}(\nu_f)\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
-
-    /*!
-        \param mMS \f$m_{MS}^{(n_l+1)}(\mu)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nuf \f$\nu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m^{RS'}(\nu_f)\f$
-    */ 
-    double mMS2mRSp(double mMS, std::pair<double,double>* mq,
-                    double asmu, double mu, double nuf, int nl, int nloops, double fdelm=1.0);
-
-    //! mRSp2mMS calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m^{RS'}(\nu_f)\f$
-
-    /*!
-        \param mRS \f$m^{RS'}(\nu_f)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param asmu \f$\alpha_s^{(n_l)}(\mu)\f$
-        \param mu \f$\mu\f$
-        \param nuf \f$\nu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
-    */ 
-    double mRSp2mMS(double mRS, std::pair<double,double>* mq,
-                    double asmu, double mu, double nuf, int nl, int nloops, double fdelm=1.0);
-
-    //! mRSp2mSI calculates \f$m_{MS}^{(n_l+1)}(m_{MS})\f$ from \f$m^{RS'}(\nu_f)\f$
-
-    /*!
-        \param mRS \f$m^{RS'}(\nu_f)\f$
-        \param mq pointer to pairs of light quark masses, not active
-        \param as pointer to a function which calculates \f$\alpha_s^{(n_l)}(\mu)\f$ and takes \f$\mu\f$ as argument
-        \param nuf \f$\nu_f\f$
-        \param nl \f$n_l\f$
-        \param nloops number of loops
-        \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
-        \return \f$m_{MS}^{(n_l+1)}(m_{MS})\f$
-    */
-    double mRSp2mSI(double mRS, std::pair<double,double>* mq,
-                    double (*as)(double), double nuf, int nl, int nloops, double fdelm=1.0);
-
-  
-    // Overload functions:
-    double LamExpl(double asmu, double mu, int nloops);
-    double LamImpl(double asmu, double mu,int nloops);
-    double AlphasLam(double Lambda, double mu, int nloops);
-    double AlphasExact(double asmu0, double mu0, double mu1, int nloops);
-    double mMS2mMS(double mmu0, double asmu0, double asmu1, int nloops);
-    AsmMS AsmMSrunexact(double mmu, double asmu0, double mu0, double mu1, 
-                      int nloops);
-
-    double DecAsDownOS(double asmu, double massth, double muth, int nloops);
-    double DecAsUpOS(double asmu, double massth, double muth, int nloops);
-    double DecAsDownMS(double asmu, double massth, double muth, int nloops);
-    double DecAsUpMS(double asmu, double massth, double muth, int nloops);
-    double DecAsDownSI(double asmu, double massth, double muth, int nloops);
-    double DecAsUpSI(double asmu, double massth, double muth, int nloops);
-
-    double DecMqUpOS(double mq, double asmu, double massth, double muth, int nloops);
-    double DecMqDownOS(double mq, double asmu, double massth, double muth, int nloops);
-    double DecMqUpMS(double mq, double asmu, double massth, double muth, int nloops);
-    double DecMqDownMS(double mq, double asmu, double massth, double muth, int nloops);
-    double DecMqUpSI(double mq, double asmu, double massth, double muth, int nloops);
-    double DecMqDownSI(double mq, double asmu, double massth, double muth, int nloops);    
-
-
-    double mMS2mOS(double mMS, std::pair<double,double>* mq,
-                   double asmu, double mu, int nloops, double fdelm=1.0);
-    double mOS2mMS(double mOS, std::pair<double,double>* mq,
-                   double asmu, double mu, int nloops, double fdelm=1.0);
-
-    double mMS2mSI(double mMS, double asmu, double mu, int nloops);
-    double mRI2mMS(double mRI, double asmu, int nloops);
-    double mMS2mRGI(double mMS, double asmu, int nloops);
-    double mRGI2mMS(double mRGI, double asmu, int nloops);
-    double mOS2mSI(double mOS, std::pair<double,double>* mq,
-                   double asM, int nloops, double fdelm=1.0);
-    double mOS2mMSrun(double mOS, std::pair<double,double>* mq,
-                      double asmu, double mu, int nloops);
-    double mMS2mOSrun(double mMS, std::pair<double,double>* mq,
-                      double asmu, double mu, int nloops);
-    double mMS2mRI(double mMS, double asmu, int nloops);
-    double mOS2mMSit(double mOS, std::pair<double,double>* mq,
-                     double asmu, double mu, int nloops); 
-    double mMS2mRGImod(double mMS, double asmu, int nloops);
-
-
-
-};
-
-#endif
diff --git a/CRunDec3/CRunDec.3.1.cpp b/CRunDec3/CRunDec.cpp
similarity index 97%
rename from CRunDec3/CRunDec.3.1.cpp
rename to CRunDec3/CRunDec.cpp
index 6e98b17..44e9cf3 100644
--- a/CRunDec3/CRunDec.3.1.cpp
+++ b/CRunDec3/CRunDec.cpp
@@ -1,10 +1,19 @@
+/*
+  CRunDec.cpp, v3.1.1
+
+  Authors: Florian Herren and Matthias Steinhauser (May 2021)
+
+  Changes since v3.1:
+  September 2025: Bug fix in mMS2mOS and mOS2mMS: Missing nl^3*(Log[mu^2/m^2])^4 terms restored.
+                  Thanks to Long Chen for pointing out that the terms are missing.
+*/
+
 /*
   CRunDec.cpp, v3.1
 
   Authors: Florian Herren and Matthias Steinhauser (May 2021)
 
   Changes since v3.0:
-  Jul 2023: Scheme for the kinetic mass cahnged to integers (A=0, B=1, C=3, D=3)
   May 2021: fix array lengths in AlphasLam and fSetAsL. Thanks to Florian Bernlochner for pointing out this bug.
   Jul 2020: implemented mMS2mKIN and mKIN2mMS (arXiv:2005:06478)
             Coefficients ctil[3][{3,4,5}] updated. Thanks to Christopher Lepenik for providing the new values.
@@ -123,7 +132,7 @@ SOFTWARE.
 #include <iomanip>
 #include <cmath>
 
-#include "CRunDec.3.1.h"
+#include "CRunDec.h"
 
 // Some constants:
 #define cf 4./3.
@@ -132,7 +141,7 @@ SOFTWARE.
 #define B4 -1.762800087073770864061897634679818807215137274389016762629478603776
 #define A4 0.5174790616738993863307581618988629456223774751413792582443193479770
 #define A5 0.5084005792422687074591088492585899413195411256648216487244977963526
-#define Pi 3.141592653589793238462643
+#define Pi M_PI
 #define Zeta2 (Pi*Pi)/6.
 #define Zeta3 1.20205690315959428539973816151144999076498629234049888179227155534
 #define Zeta4 (Pi*Pi*Pi*Pi)/90.
@@ -833,7 +842,7 @@ double CRunDec::fMsFromOs4(double mu, double M, double nl, double err){
      erg =  - 3654.15040757339*err - 1524.2292266911543*lmM - 288.778291935394*lmM*lmM - 32.54735725308642*lmM*lmM*lmM - 
             1.85546875*lmM*lmM*lmM*lmM +
             nl*nl*nl*(0. + 0.678141025604516*err + 0.3205521521864135*lmM + 0.0800290327210927*lmM*lmM +      
-            0.010030864197530864*lmM*lmM*lmM) + 
+            0.010030864197530864*lmM*lmM*lmM + 0.001157407407407407*lmM*lmM*lmM*lmM) + 
             nl*nl*(0. - 43.48241924867489*err - 19.82672048099557*lmM - 4.482957520194182*lmM*lmM - 
             0.5270061728395061*lmM*lmM*lmM - 0.04108796296296297*lmM*lmM*lmM*lmM) +
             nl*(0. + 756.9421565599532*err + 330.1770776731065*lmM + 67.99849534415492*lmM*lmM + 
@@ -841,9 +850,9 @@ double CRunDec::fMsFromOs4(double mu, double M, double nl, double err){
      return erg;
 }
 
-// Function: double CRunDec::mOS2mMS(double mOS, RunDecPair mq[], double asmu,
+// Function: double CRunDec::mOS2mMS(double mOS, std::pair<double,double>* mq, double asmu,
 //                           double Mu, int nl, double fdelm)
-double CRunDec::mOS2mMS(double mOS, RunDecPair mq[], double asmu, double Mu,int nl, double fdelm){
+double CRunDec::mOS2mMS(double mOS, std::pair<double,double>* mq, double asmu, double Mu,int nl, double fdelm){
      if(nl<0||nl>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
        RETURN 
@@ -1017,7 +1026,7 @@ double CRunDec::fOsFromMs4(double mu, double M, double nl, double err){
      erg = 3567.602784989066*err + 1727.2260148986106*lmM + 409.2429990574718*lmM*lmM + 66.93663194444443*lmM*lmM*lmM + 
            8.056278935185185*lmM*lmM*lmM*lmM + 
            nl*nl*nl*(-0.678141025604516*err - 0.3205521521864134*lmM - 0.0800290327210927*lmM*lmM - 
-           0.010030864197530864*lmM*lmM*lmM) + 
+           0.010030864197530864*lmM*lmM*lmM - 0.001157407407407407*lmM*lmM*lmM*lmM) + 
            nl*(-745.7207145811878*err - 358.29765085086774*lmM - 87.39262571554698*lmM*lmM - 
            11.883873456790122*lmM*lmM*lmM - 1.2705439814814814*lmM*lmM*lmM*lmM) + 
            nl*nl*(43.396250117985666*err + 20.528466368867228*lmM + 4.971905254812516*lmM*lmM + 
@@ -1026,7 +1035,7 @@ double CRunDec::fOsFromMs4(double mu, double M, double nl, double err){
 }
 
 // Compute 2 Loop contribution to mOS2mMS at 3 loops for MS light quarks
-double CRunDec::deltamOS2mMS(double mOS, RunDecPair mq[], double asmu, double mu, int nlq, int nloops){
+double CRunDec::deltamOS2mMS(double mOS, std::pair<double,double>* mq, double asmu, double mu, int nlq, int nloops){
      double erg=0.0;
      if(!mq)
        return 0.0;
@@ -1057,7 +1066,7 @@ double CRunDec::deltamOS2mMS(double mOS, RunDecPair mq[], double asmu, double mu
 }
 
 // Compute 2 Loop contribution to mMS2mOS at 3 loops for MS light quarks
-double CRunDec::deltamMS2mOS(double mMS, RunDecPair mq[], double asmu, double mu, int nlq, int nloops){
+double CRunDec::deltamMS2mOS(double mMS, std::pair<double,double>* mq, double asmu, double mu, int nlq, int nloops){
      double erg=0.0;
      double lmu = log(mu*mu/(mMS*mMS));
      if(!mq)
@@ -1112,9 +1121,9 @@ double CRunDec::fZmInvM(double nl){
      return erg;
 }
 
-// Function: double CRunDec::mMS2mOS(double mMS, RunDecPair mq[], double asmu,
+// Function: double CRunDec::mMS2mOS(double mMS, std::pair<double,double>* mq, double asmu,
 //                           double mu,int nl)
-double CRunDec::mMS2mOS(double mMS, RunDecPair mq[], double asmu, double mu, int nl, double fdelm){
+double CRunDec::mMS2mOS(double mMS, std::pair<double,double>* mq, double asmu, double mu, int nl, double fdelm){
      if(nl<0||nl>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
        RETURN  
@@ -1144,9 +1153,9 @@ double CRunDec::mMS2mOS(double mMS, RunDecPair mq[], double asmu, double mu, int
      return mMS*erg;
 }
 
-// Function: double CRunDec::mMS2mOSmod(double mMS, RunDecPair mq[], double asmu,
+// Function: double CRunDec::mMS2mOSmod(double mMS, std::pair<double,double>* mq, double asmu,
 //                           double mu, int nf, int nloop, double fdelm), needed for several other mass relations
-double CRunDec::mMS2mOSmod(double mMS, RunDecPair mq[], double asmu, double mu,int nf, int nloop, double fdelm){
+double CRunDec::mMS2mOSmod(double mMS, std::pair<double,double>* mq, double asmu, double mu,int nf, int nloop, double fdelm){
      if(nloop<0||nloop>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloop <<" LOOPS"<<endl;
        RETURN  
@@ -1229,9 +1238,9 @@ double CRunDec::fMumFromOs4(double err){
      return erg;
 }
 
-// Function: double CRunDec::mOS2mSI(double mOS, RunDecPair mq[], double asM, 
+// Function: double CRunDec::mOS2mSI(double mOS, std::pair<double,double>* mq, double asM, 
 //                           int nl)
-double CRunDec::mOS2mSI(double mOS, RunDecPair mq[], double asM, int nl, double fdelm){
+double CRunDec::mOS2mSI(double mOS, std::pair<double,double>* mq, double asM, int nl, double fdelm){
      if(nl<0||nl>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
        RETURN  
@@ -1264,9 +1273,9 @@ double CRunDec::mOS2mSI(double mOS, RunDecPair mq[], double asM, int nl, double
        
 }
 
-// Function: double CRunDec::mOS2mMSrun(double mOS, RunDecPair mq[], double asmu, 
+// Function: double CRunDec::mOS2mMSrun(double mOS, std::pair<double,double>* mq, double asmu, 
 //                           double mu, int nl)
-double CRunDec::mOS2mMSrun(double mOS, RunDecPair mq[], double asmu, double mu,
+double CRunDec::mOS2mMSrun(double mOS, std::pair<double,double>* mq, double asmu, double mu,
 			   int nl){
      double asM=0.0;
      asM= this-> AlphasExact(asmu, mu, mOS, nl);
@@ -1276,9 +1285,9 @@ double CRunDec::mOS2mMSrun(double mOS, RunDecPair mq[], double asmu, double mu,
      return newM;       
 }
 
-// Function: double CRunDec::mMS2mOSrun(double mMS, RunDecPair mq[], double asmu, 
+// Function: double CRunDec::mMS2mOSrun(double mMS, std::pair<double,double>* mq, double asmu, 
 //                           double mu, int nl)
-double CRunDec::mMS2mOSrun(double mMS, RunDecPair mq[], double asmu, double mu,
+double CRunDec::mMS2mOSrun(double mMS, std::pair<double,double>* mq, double asmu, double mu,
 			   int nl){
      double mNeu = mMS2mSI(mMS, asmu, mu, nl);
      double asmNeu = AlphasExact(asmu, mu, mNeu, nl);
@@ -1321,7 +1330,7 @@ double CRunDec::mMS2mRI(double mMS, double asmu, int nl){
 }
 
 // Coefficients needed for the transformation of mOS to mMSit
-double CRunDec::fHelpmOS2mMSit(double mMS, double mOS, RunDecPair mq[], double asmu,
+double CRunDec::fHelpmOS2mMSit(double mMS, double mOS, std::pair<double,double>* mq, double asmu,
                                 double mu, int nl){
      double sum[4];
      double deltalight = deltamMS2mOS(mMS,mq,asmu/Pi,mu,Nf-1,nl);
@@ -1343,9 +1352,9 @@ double CRunDec::fHelpmOS2mMSit(double mMS, double mOS, RunDecPair mq[], double a
      return erg;
 }
 
-// Function: double CRunDec::mOS2mMSit(double mOS, RunDecPair mq[], double asmu, 
+// Function: double CRunDec::mOS2mMSit(double mOS, std::pair<double,double>* mq, double asmu, 
 //                          double mu, int nl)
-double CRunDec::mOS2mMSit(double mOS, RunDecPair mq[], double asmu, double mu,
+double CRunDec::mOS2mMSit(double mOS, std::pair<double,double>* mq, double asmu, double mu,
                            int nl){
      if(nl<0||nl>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nl<<" LOOPS"<<endl;
@@ -1402,8 +1411,8 @@ double CRunDec::PSdelta(double asmu, double muf, double mu, int nl, int nloops)
 	 return delta;
 }
 
-// Function: double CRunDec::mOS2mPS(double mOS, RunDecPair mq[], double asmu, double mu, double muf, int nl, int nloops)
-double CRunDec::mOS2mPS(double mOS, RunDecPair mq[], double asmu, double mu, double muf, int nl, int nloops) {
+// Function: double CRunDec::mOS2mPS(double mOS, std::pair<double,double>* mq, double asmu, double mu, double muf, int nl, int nloops)
+double CRunDec::mOS2mPS(double mOS, std::pair<double,double>* mq, double asmu, double mu, double muf, int nl, int nloops) {
      if(nloops<0||nloops>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
        RETURN
@@ -1412,9 +1421,9 @@ double CRunDec::mOS2mPS(double mOS, RunDecPair mq[], double asmu, double mu, dou
 	 return mOS - muf*PSdelta(asmu/Pi, muf, mu, nl, nloops);
 }
 
-// Function: double CRunDec::mMS2mPS(double mMS, RunDecPair mq[], double asmu,
+// Function: double CRunDec::mMS2mPS(double mMS, std::pair<double,double>* mq, double asmu,
 //                                   double mu, double muf, int nl, int nloops, double fdelm)
-double CRunDec::mMS2mPS(double mMS, RunDecPair mq[], double asmu,
+double CRunDec::mMS2mPS(double mMS, std::pair<double,double>* mq, double asmu,
                         double mu, double muf, int nl, int nloops, double fdelm) {
      if(nloops<0||nloops>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
@@ -1426,9 +1435,9 @@ double CRunDec::mMS2mPS(double mMS, RunDecPair mq[], double asmu,
      return (exmOS - muf*delmuf);
 }
 
-// Function: double CRunDec::mPS2mMS(double mPS, RunDecPair mq[], double asmu,
+// Function: double CRunDec::mPS2mMS(double mPS, std::pair<double,double>* mq, double asmu,
 //                                   double mu, double muf, int nl, int nloops, double fdelm)
-double CRunDec::mPS2mMS(double mPS, RunDecPair mq[], double asmu,
+double CRunDec::mPS2mMS(double mPS, std::pair<double,double>* mq, double asmu,
                         double mu, double muf, int nl, int nloops, double fdelm) {
      if(nloops<0||nloops>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
@@ -1471,10 +1480,10 @@ double CRunDec::mPS2mMS(double mPS, RunDecPair mq[], double asmu,
      return 0.0;
 }
 
-// Function: double CRunDec::mPS2mSI(double mPS, RunDecPair mq[],
+// Function: double CRunDec::mPS2mSI(double mPS, std::pair<double,double>* mq,
 //                                   double (*as)(double), double muf, int nl, int nloops, double fdelm)
 // The function pointer passed should contain the adress of a function computing alpha_s in dependence of mu
-double CRunDec::mPS2mSI(double mPS, RunDecPair mq[],
+double CRunDec::mPS2mSI(double mPS, std::pair<double,double>* mq,
                         double (*as)(double), double muf, int nl, int nloops, double fdelm) {
     if(as == NULL) {
       cout << "Pointer to as == NULL! Aborting..." << endl;
@@ -1544,9 +1553,9 @@ double CRunDec::E1p(double mOS, double asmu, double mu, int nl, int nloops) {
 	 return -E*(4.*asmu*asmu*mOS)/9.;
 }
 
-// Function: double CRunDec::mOS2m1S(double mOS, RunDecPair mq[],
+// Function: double CRunDec::mOS2m1S(double mOS, std::pair<double,double>* mq,
 //                                   double asmu, double mu, int nl, int nloops)
-double CRunDec::mOS2m1S(double mOS, RunDecPair mq[], double asmu, double mu, int nl, int nloops) {
+double CRunDec::mOS2m1S(double mOS, std::pair<double,double>* mq, double asmu, double mu, int nl, int nloops) {
      if(nloops<0||nloops>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
        RETURN
@@ -1554,9 +1563,9 @@ double CRunDec::mOS2m1S(double mOS, RunDecPair mq[], double asmu, double mu, int
 	 return mOS + 0.5*E1p(mOS, asmu, mu, nl, nloops);
 }
 
-// Function: double CRunDec::mMS2m1S(double mMS, RunDecPair mq[],
+// Function: double CRunDec::mMS2m1S(double mMS, std::pair<double,double>* mq,
 //                                   double asmu, double mu, int nl, int nloops, double fdelm)
-double CRunDec::mMS2m1S(double mMS, RunDecPair mq[],
+double CRunDec::mMS2m1S(double mMS, std::pair<double,double>* mq,
                         double asmu, double mu, int nl, int nloops, double fdelm) {
      if(nloops<0||nloops>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
@@ -1706,9 +1715,9 @@ double CRunDec::mMS2m1S(double mMS, RunDecPair mq[],
      return m1S;  
 }
 
-// Function: double CRunDec::m1S2mMS(double m1S, RunDecPair mq[],
+// Function: double CRunDec::m1S2mMS(double m1S, std::pair<double,double>* mq,
 //                                   double asmu, double mu, int nl, int nloops, double fdelm)
-double CRunDec::m1S2mMS(double m1S, RunDecPair mq[],
+double CRunDec::m1S2mMS(double m1S, std::pair<double,double>* mq,
                         double asmu, double mu, int nl, int nloops, double fdelm) {
      if(nloops<0||nloops>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
@@ -1746,10 +1755,10 @@ double CRunDec::m1S2mMS(double m1S, RunDecPair mq[],
      return 0.0;
 }
 
-// Function: double CRunDec::m1S2mSI(double m1S, RunDecPair mq[],
+// Function: double CRunDec::m1S2mSI(double m1S, std::pair<double,double>* mq,
 //                                   double (*as)(double), int nl, int nloops, double fdelm)
 // The function pointer passed should contain the adress of a function computing alpha_s in dependence of mu
-double CRunDec::m1S2mSI(double m1S, RunDecPair mq[],
+double CRunDec::m1S2mSI(double m1S, std::pair<double,double>* mq,
                         double (*as)(double), int nl, int nloops, double fdelm) {
     if(as == NULL) {
       cout << "Pointer to as == NULL! Aborting..." << endl;
@@ -1911,9 +1920,9 @@ double CRunDec::exOS2RSp(double api, double mmu, double nnuf, int nnl, int nloop
 	 return res;
 }
 
-// Function: CRunDec::mOS2mRS(double mOS, RunDecPair mq[], double asmu,
+// Function: CRunDec::mOS2mRS(double mOS, std::pair<double,double>* mq, double asmu,
 //                            double mu, double nuf, int nl, int nloops, bool prime)
-double CRunDec::mOS2mRS(double mOS, RunDecPair mq[], double asmu,
+double CRunDec::mOS2mRS(double mOS, std::pair<double,double>* mq, double asmu,
                         double mu, double nuf, int nl, int nloops, bool prime) {
      if(nloops<0||nloops>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
@@ -1926,9 +1935,9 @@ double CRunDec::mOS2mRS(double mOS, RunDecPair mq[], double asmu,
      }
 }
 
-// Function: double CRunDec::mMS2mRS(double mMS, RunDecPair mq[], double asmu,
+// Function: double CRunDec::mMS2mRS(double mMS, std::pair<double,double>* mq, double asmu,
 //                                   double mu, double nuf, int nl, int nloops, double fdelm, bool prime)
-double CRunDec::mMS2mRS(double mMS, RunDecPair mq[], double asmu,
+double CRunDec::mMS2mRS(double mMS, std::pair<double,double>* mq, double asmu,
                         double mu, double nuf, int nl, int nloops, double fdelm, bool prime) {
      if(nloops<0||nloops>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
@@ -1941,9 +1950,9 @@ double CRunDec::mMS2mRS(double mMS, RunDecPair mq[], double asmu,
      }
 }
 
-// Function: double CRunDec::mRS2mMS(double mRS, RunDecPair mq[], double asmu,
+// Function: double CRunDec::mRS2mMS(double mRS, std::pair<double,double>* mq, double asmu,
 //                                   double mu, double muf, int nl, int nloops, double fdelm, bool prime)
-double CRunDec::mRS2mMS(double mRS, RunDecPair mq[], double asmu,
+double CRunDec::mRS2mMS(double mRS, std::pair<double,double>* mq, double asmu,
                         double mu, double muf, int nl, int nloops, double fdelm, bool prime) {
      if(nloops<0||nloops>4){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops<<" LOOPS"<<endl;
@@ -1981,10 +1990,10 @@ double CRunDec::mRS2mMS(double mRS, RunDecPair mq[], double asmu,
      return 0.0;
 }
 
-// Function: double CRunDec::mRS2mSI(double mRS, RunDecPair mq[], double (*as)(double),
+// Function: double CRunDec::mRS2mSI(double mRS, std::pair<double,double>* mq, double (*as)(double),
 //                                   double muf, int nl, int nloops, double fdelm, bool prime)
 // The function pointer passed should contain the adress of a function computing alpha_s in dependence of mu
-double CRunDec::mRS2mSI(double mRS, RunDecPair mq[], double (*as)(double),
+double CRunDec::mRS2mSI(double mRS, std::pair<double,double>* mq, double (*as)(double),
                         double muf, int nl, int nloops, double fdelm, bool prime) {
     if(as == NULL) {
       cout << "Pointer to as == NULL! Aborting..." << endl;
@@ -3162,22 +3171,27 @@ double CRunDec::mkin2mMSD(double mkin, double apinlmus, double mus, double mufac
     return mMS;
 }
 
-// Function: double CRunDec::mMS2mKIN(double mMS, RunDecPair mq[],
-//                                    double asmus, double mus, double muf, int nl, int nloops, int deccase)
-double CRunDec::mMS2mKIN(double mMS, RunDecPair mq[],
-                         double asmus, double mus, double muf, int nlmsos, int nloskin, int nloops, int deccase) {
+// Function: double CRunDec::mMS2mKIN(double mMS, std::pair<double,double>* mq,
+//                                    double asmus, double mus, double muf, int nl, int nloops, std::string deccase)
+double CRunDec::mMS2mKIN(double mMS, std::pair<double,double>* mq,
+                         double asmus, double mus, double muf, int nlmsos, int nloskin, int nloops, std::string deccase) {
      if(nloops<0||nloops>3){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops <<" LOOPS"<<endl;
        RETURN  
      }
      double mkin;
-
-     if ( deccase < 0 || deccase > 3){
+     int decc = 0;
+     if(deccase == "A") decc = 0;
+     else if(deccase == "B") decc = 1;
+     else if(deccase == "C") decc = 2;
+     else if(deccase == "D") decc = 3;
+     else if(deccase == "") decc = 4;
+     else {
        cout<<"DECCASE "<< deccase <<" NOT IMPLEMENTED"<<endl;
        RETURN       
-     } 
+     }
      
-     switch(deccase) {
+     switch(decc) {
        case 0:
            mkin = mMS2mkinA(mMS, asmus/Pi, mus, muf, nlmsos, nloskin, mq[0].first, mq[0].second, nloops);
            break;
@@ -3197,32 +3211,38 @@ double CRunDec::mMS2mKIN(double mMS, RunDecPair mq[],
      return mkin;
 }
 
-double CRunDec::mMS2mKIN(double mMS, RunDecPair mq[], double asmus, double mus, double muf, int nloops, int deccase) {
-     if(deccase == 0) return mMS2mKIN(mMS, mq, asmus, mus, muf, 3, 3, nloops, deccase);
-     else if(deccase == 1) return mMS2mKIN(mMS, mq, asmus, mus, muf, 3, 3, nloops, deccase);
-     else if(deccase == 2) return mMS2mKIN(mMS, mq, asmus, mus, muf, 3, 4, nloops, deccase);
-     else if(deccase == 3) return mMS2mKIN(mMS, mq, asmus, mus, muf, 3, 3, nloops, deccase);
+double CRunDec::mMS2mKIN(double mMS, std::pair<double,double>* mq, double asmus, double mus, double muf, int nloops, std::string deccase) {
+     if(deccase == "A") return mMS2mKIN(mMS, mq, asmus, mus, muf, 3, 3, nloops, deccase);
+     else if(deccase == "B") return mMS2mKIN(mMS, mq, asmus, mus, muf, 3, 3, nloops, deccase);
+     else if(deccase == "C") return mMS2mKIN(mMS, mq, asmus, mus, muf, 3, 4, nloops, deccase);
+     else if(deccase == "D") return mMS2mKIN(mMS, mq, asmus, mus, muf, 3, 3, nloops, deccase);
      else {
        cout<<"DECCASE "<< deccase <<" NOT IMPLEMENTED"<<endl;
        RETURN       
      }
 }
 
-// Function: double CRunDec::mKIN2mMS(double mKIN, RunDecPair mq[],
+// Function: double CRunDec::mKIN2mMS(double mKIN, std::pair<double,double>* mq,
 //                                    double asmus, double mus, double muf, int nlmsos, int nloskin, int nloops, std::string deccase)
-double CRunDec::mKIN2mMS(double mKIN, RunDecPair mq[],
-                         double asmus, double mus, double muf, int nlmsos, int nloskin, int nloops, int deccase) {
+double CRunDec::mKIN2mMS(double mKIN, std::pair<double,double>* mq,
+                         double asmus, double mus, double muf, int nlmsos, int nloskin, int nloops, std::string deccase) {
      if(nloops<0||nloops>3){
        cout<<"PROCEDURE IS NOT IMPLEMENTED FOR "<< nloops <<" LOOPS"<<endl;
        RETURN  
      }
      double mMS;
-     if( deccase < 0 || deccase > 3) {
+     int decc = 0;
+     if(deccase == "A") decc = 0;
+     else if(deccase == "B") decc = 1;
+     else if(deccase == "C") decc = 2;
+     else if(deccase == "D") decc = 3;
+     else if(deccase == "") decc = 4;
+     else {
        cout<<"DECCASE "<< deccase <<" NOT IMPLEMENTED"<<endl;
        RETURN       
      }
      
-     switch(deccase) {
+     switch(decc) {
        case 0:
            mMS = mkin2mMSA(mKIN, asmus/Pi, mus, muf, nlmsos, nloskin, mq[0].first, mq[0].second, nloops);
            break;
@@ -3242,11 +3262,11 @@ double CRunDec::mKIN2mMS(double mKIN, RunDecPair mq[],
      return mMS;
 }
 
-double CRunDec::mKIN2mMS(double mKIN, RunDecPair mq[], double asmus, double mus, double muf, int nloops, int deccase) {
-     if(deccase == 0) return mKIN2mMS(mKIN, mq, asmus, mus, muf, 3, 3, nloops, deccase);
-     else if(deccase == 1) return mKIN2mMS(mKIN, mq, asmus, mus, muf, 3, 3, nloops, deccase);
-     else if(deccase == 2) return mKIN2mMS(mKIN, mq, asmus, mus, muf, 3, 4, nloops, deccase);
-     else if(deccase == 3) return mKIN2mMS(mKIN, mq, asmus, mus, muf, 3, 3, nloops, deccase);
+double CRunDec::mKIN2mMS(double mKIN, std::pair<double,double>* mq, double asmus, double mus, double muf, int nloops, std::string deccase) {
+     if(deccase == "A") return mKIN2mMS(mKIN, mq, asmus, mus, muf, 3, 3, nloops, deccase);
+     else if(deccase == "B") return mKIN2mMS(mKIN, mq, asmus, mus, muf, 3, 3, nloops, deccase);
+     else if(deccase == "C") return mKIN2mMS(mKIN, mq, asmus, mus, muf, 3, 4, nloops, deccase);
+     else if(deccase == "D") return mKIN2mMS(mKIN, mq, asmus, mus, muf, 3, 3, nloops, deccase);
      else {
        cout<<"DECCASE "<< deccase <<" NOT IMPLEMENTED"<<endl;
        RETURN       
@@ -3910,7 +3930,7 @@ double CRunDec::DecLambdaUp(double lam, double massth, int nl,
 
 // Function double CRunDec::AlL2AlH(double asl, double mu1, TriplenfMmu decpar[],
 //                          double mu2, int nl)
-double CRunDec::AlL2AlH(double asl, double mu1, TriplenfMmu *decpar, double mu2, 
+double CRunDec::AlL2AlH(double asl, double mu1, TriplenfMmu decpar[], double mu2, 
                          int nl){
      int n=0;
      int help;
@@ -4174,13 +4194,13 @@ AsmMS CRunDec::AsmMSrunexact(double mMu, double AlphaS0, double Mu0,
      return (this->AsmMSrunexact(mMu, AlphaS0, Mu0, MuEnd, nl));
 }
 
-double CRunDec::mMS2mOS(double mMS, RunDecPair mq[], double asmu, double mu,int nf,
+double CRunDec::mMS2mOS(double mMS, std::pair<double,double>* mq, double asmu, double mu,int nf,
                            int nl, double fdelm){
      SetConstants(nf);
      return (this->mMS2mOS(mMS, mq, asmu, mu, nl, fdelm));
 } 
   
-double CRunDec::mOS2mMS(double mOS, RunDecPair mq[], double asmu, double Mu,int nf,
+double CRunDec::mOS2mMS(double mOS, std::pair<double,double>* mq, double asmu, double Mu,int nf,
                            int nl, double fdelm){
      SetConstants(nf);
      return (this->mOS2mMS(mOS, mq, asmu, Mu, nl, fdelm));
@@ -4206,19 +4226,19 @@ double CRunDec::mRGI2mMS(double mRGI, double asmu,int nf, int nl){
      return (this->mRGI2mMS(mRGI, asmu, nl));
 }
   
-double CRunDec::mOS2mSI(double mOS, RunDecPair mq[], double asM,int nf, int nl, double fdelm){
+double CRunDec::mOS2mSI(double mOS, std::pair<double,double>* mq, double asM,int nf, int nl, double fdelm){
      SetConstants(nf);
      return (this->mOS2mSI(mOS, mq, asM, nl, fdelm));
 }
 
  
-double CRunDec::mOS2mMSrun(double mOS, RunDecPair mq[], double asmu, double mu,
+double CRunDec::mOS2mMSrun(double mOS, std::pair<double,double>* mq, double asmu, double mu,
                               int nf, int nl){
      SetConstants(nf);
      return (this->mOS2mMSrun(mOS, mq, asmu, mu, nl));
 }
    
-double CRunDec::mMS2mOSrun(double mMS, RunDecPair mq[], double asmu, double mu,
+double CRunDec::mMS2mOSrun(double mMS, std::pair<double,double>* mq, double asmu, double mu,
                               int nf, int nl){
      SetConstants(nf);
      return (this->mMS2mOSrun(mMS, mq, asmu, mu, nl));
@@ -4229,7 +4249,7 @@ double CRunDec::mMS2mRI(double mMS, double asmu,int nf, int nl){
      return (this->mMS2mRI(mMS, asmu, nl));
 }
   
-double CRunDec::mOS2mMSit(double mOS, RunDecPair mq[], double asmu, double mu,
+double CRunDec::mOS2mMSit(double mOS, std::pair<double,double>* mq, double asmu, double mu,
                              int nf,int nl){
      SetConstants(nf);
      return (this->mOS2mMSit(mOS, mq, asmu, mu, nl));
@@ -4241,35 +4261,35 @@ double CRunDec::mMS2mRGImod(double mMS, double asmu,int nf, int nl){
 }       
 
 
-double CRunDec::mOS2mRS(double mOS, RunDecPair mq[], double asmu, double mu, double nuf, int nl, int nloops) {
+double CRunDec::mOS2mRS(double mOS, std::pair<double,double>* mq, double asmu, double mu, double nuf, int nl, int nloops) {
      return (this->mOS2mRS(mOS, mq, asmu, mu, nuf, nl, nloops, false));
 }
 
-double CRunDec::mOS2mRSp(double mOS, RunDecPair mq[], double asmu, double mu, double nuf, int nl, int nloops) {
+double CRunDec::mOS2mRSp(double mOS, std::pair<double,double>* mq, double asmu, double mu, double nuf, int nl, int nloops) {
      return (this->mOS2mRS(mOS, mq, asmu, mu, nuf, nl, nloops, true));
 }
 
-double CRunDec::mMS2mRS(double mMS, RunDecPair mq[], double asmu, double mu, double nuf, int nl, int nloops, double fdelm) {
+double CRunDec::mMS2mRS(double mMS, std::pair<double,double>* mq, double asmu, double mu, double nuf, int nl, int nloops, double fdelm) {
      return (this->mMS2mRS(mMS, mq, asmu, mu, nuf, nl, nloops, fdelm, false));
 }
 
-double CRunDec::mMS2mRSp(double mMS, RunDecPair mq[], double asmu, double mu, double nuf, int nl, int nloops, double fdelm) {
+double CRunDec::mMS2mRSp(double mMS, std::pair<double,double>* mq, double asmu, double mu, double nuf, int nl, int nloops, double fdelm) {
      return (this->mMS2mRS(mMS, mq, asmu, mu, nuf, nl, nloops, fdelm, true));
 }
 
-double CRunDec::mRS2mMS(double mRS, RunDecPair mq[], double asmu, double mu, double muf, int nl, int nloops, double fdelm) {
+double CRunDec::mRS2mMS(double mRS, std::pair<double,double>* mq, double asmu, double mu, double muf, int nl, int nloops, double fdelm) {
      return (this->mRS2mMS(mRS, mq, asmu, mu, muf, nl, nloops, fdelm, false));
 }
 
-double CRunDec::mRSp2mMS(double mRS, RunDecPair mq[], double asmu, double mu, double muf, int nl, int nloops, double fdelm) {
+double CRunDec::mRSp2mMS(double mRS, std::pair<double,double>* mq, double asmu, double mu, double muf, int nl, int nloops, double fdelm) {
      return (this->mRS2mMS(mRS, mq, asmu, mu, muf, nl, nloops, fdelm, true));
 }
 
-double CRunDec::mRS2mSI(double mRS, RunDecPair mq[], double (*as)(double), double muf, int nl, int nloops, double fdelm) {
+double CRunDec::mRS2mSI(double mRS, std::pair<double,double>* mq, double (*as)(double), double muf, int nl, int nloops, double fdelm) {
      return (this->mRS2mSI(mRS, mq, as, muf, nl, nloops, fdelm, false));
 }
 
-double CRunDec::mRSp2mSI(double mRS, RunDecPair mq[], double (*as)(double), double muf, int nl, int nloops, double fdelm) {
+double CRunDec::mRSp2mSI(double mRS, std::pair<double,double>* mq, double (*as)(double), double muf, int nl, int nloops, double fdelm) {
      return (this->mRS2mSI(mRS, mq, as, muf, nl, nloops, fdelm, true));
 }
 
diff --git a/CRunDec3/CRunDec.3.1.h b/CRunDec3/CRunDec.h
similarity index 92%
rename from CRunDec3/CRunDec.3.1.h
rename to CRunDec3/CRunDec.h
index eb07c7f..7672d73 100644
--- a/CRunDec3/CRunDec.3.1.h
+++ b/CRunDec3/CRunDec.h
@@ -80,18 +80,6 @@ struct TriplenfMmu{
     double muth;
 };
 
-//RunDecPair mq[]
-//! Structure containing: the number the mass of the heavy quark (first) and its scale (second)
-/*!
-  This structure is used to pass information on decoupling thresholds.
-  This substitutes the original argument pair<double,double>* mq and facilitate the interface to python.
-*/
-struct RunDecPair{
-    double first;
-    double second;
-};
-
-
 
 //! Structure containing: \f$\alpha_s^{(n_f)}\f$ (Asexact) and \f$m_{MS}^{(n_f)}\f$ (mMSexact)
 /*!
@@ -118,20 +106,20 @@ class CRunDec
 {
 private: 
     // Aux. constants for implicit Runge-Kutta-Procedure:
-    double a2=0.2, a3=0.3, a4=0.6, a5=1., a6=0.875;
+    const double a2=0.2, a3=0.3, a4=0.6, a5=1., a6=0.875;
        
-    double b21=0.2, b31=3./40., b32=9./40., b41=0.3, b42=-0.9, 
+    const double b21=0.2, b31=3./40., b32=9./40., b41=0.3, b42=-0.9, 
                  b43=6./5.;
-    double b51=-11./54., b52=2.5, b53=-70./27., b54=35./27.;
-    double b61=1631./55296., b62=175./512., b63=575./13824.;
-    double b64=44275./110592., b65=253./4096.;
+    const double b51=-11./54., b52=2.5, b53=-70./27., b54=35./27.;
+    const double b61=1631./55296., b62=175./512., b63=575./13824.;
+    const double b64=44275./110592., b65=253./4096.;
        
-    double c1=37./378., c2=0., c3=250./621., c4=125./594., c5=0.;
-    double c6= 512./1771.;
+    const double c1=37./378., c2=0., c3=250./621., c4=125./594., c5=0.;
+    const double c6= 512./1771.;
        
-    double dc1=37./378.-2825./27648., dc2=0.-0., 
+    const double dc1=37./378.-2825./27648., dc2=0.-0., 
                  dc3=250./621.-18575./48384.;
-    double dc4=125./594.-13525./55296., dc5=0.-277./14336., 
+    const double dc4=125./594.-13525./55296., dc5=0.-277./14336., 
                  dc6=512./1771.-0.25;
   
     // Coefficients for diff. equations:
@@ -172,9 +160,9 @@ class CRunDec
     double fMsFromOs4(double mu, double M, double nl, double err);
     double fZmM(double n);
     double fZmInvM(double n);
-    double deltamOS2mMS(double mOS, RunDecPair mq[],
+    double deltamOS2mMS(double mOS, std::pair<double,double>* mq,
                         double asmu, double mu, int nlq, int nloops); 
-    double deltamMS2mOS(double mMS, RunDecPair mq[],
+    double deltamMS2mOS(double mMS, std::pair<double,double>* mq,
                         double asmu, double mu, int nlq, int nloops); 
     double fMsFromRi1(void);
     double fMsFromRi2(void);
@@ -185,7 +173,7 @@ class CRunDec
     double fMumFromOs4(double err);
     double fRiFromMs(double alpha, double nl);
     double fMsFromRi(double alpha, double nl);
-    double fHelpmOS2mMSit(double mMS,double mOS, RunDecPair mq[],
+    double fHelpmOS2mMSit(double mMS,double mOS, std::pair<double,double>* mq,
                           double asmu, double mu, int nl);
     double fas5to6os(double alpha, double mass, double mu, double nlq, double nl);
     double fas6to5os(double alpha, double mass, double mu, double nlq, double nl);
@@ -204,7 +192,7 @@ class CRunDec
     double E1p(double mOS, double asmu, double mu, int nl, int nloops);
     double exOS2RS(double api, double mmu, double nnuf, int nnl, int nloops);
     double exOS2RSp(double api, double mmu, double nnuf, int nnl, int nloops);
-    double mMS2mOSmod(double mMS, RunDecPair mq[],
+    double mMS2mOSmod(double mMS, std::pair<double,double>* mq,
                       double asmu, double mu, int nf, int nloops, double err);
     double mkin2mMSA(double mkin, double apinlmus, double mus, double mufac, int NLMSOS, int NLOSKIN, double mcMSmusmcin, double musmcin, int nloops);
     double mkin2mMSB(double mkin, double apinlmus, double mus, double mufac, int NLMSOS, int NLOSKIN, double mcMSmusmcin, double musmcin, int nloops);
@@ -228,8 +216,7 @@ class CRunDec
     CRunDec(int);
   
     // Arrays and structs to store data:
-    //std::pair<double,double> mq[4];
-    RunDecPair mq[4];
+    std::pair<double,double> mq[4];
     TriplenfMmu nfMmu[4];
     AsmMS AM;
   
@@ -492,7 +479,7 @@ class CRunDec
         \param nloops number of loops
         \return \f$\alpha_s(\mu_2)\f$
     */
-    double AlL2AlH(double asl, double mu1, TriplenfMmu *decpar, double mu2, int nloops);
+    double AlL2AlH(double asl, double mu1, TriplenfMmu decpar[], double mu2, int nloops);
 
     //! AlH2AlL calculates \f$\alpha_s(\mu_2)\f$ from \f$\alpha_s(\mu_1)\f$ decoupling at intermediate scales, running from high to low
     /*!
@@ -545,7 +532,7 @@ class CRunDec
         \return \f$M_{OS}\f$
     */
 
-    double mMS2mOS(double mMS, RunDecPair mq[],
+    double mMS2mOS(double mMS, std::pair<double,double>* mq,
                    double asmu, double mu,int nf, int nloops, double fdelm=1.0);
 
     //! mOS2mMS calculates \f$m_{MS}^{(n_f)}(\mu)\f$ from \f$M_{OS}\f$
@@ -559,7 +546,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m_{MS}^{(n_f)}(\mu)\f$
     */
-    double mOS2mMS(double mOS, RunDecPair mq[],
+    double mOS2mMS(double mOS, std::pair<double,double>* mq,
                    double asmu, double mu,int nf, int nloops, double fdelm=1.0);
 
     //! mMS2mSI calculates \f$m_{MS}^{(n_f)}(m_{MS})\f$ from \f$m_{MS}^{(n_f)}(\mu)\f$
@@ -615,7 +602,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m_{MS}^{(n_f)}(m_{MS})\f$
     */
-    double mOS2mSI(double mOS, RunDecPair mq[],
+    double mOS2mSI(double mOS, std::pair<double,double>* mq,
                    double asM, int nf, int nloops, double fdelm=1.0);
 
     //! mOS2mMSrun calculates \f$m_{MS}^{(n_f)}(\mu)\f$ from \f$M_{OS}\f$
@@ -630,7 +617,7 @@ class CRunDec
         \param nloops number of loops
         \return \f$m_{MS}^{(n_f)}(\mu)\f$
     */ 
-    double mOS2mMSrun(double mOS, RunDecPair mq[],
+    double mOS2mMSrun(double mOS, std::pair<double,double>* mq,
                       double asmu, double mu,int nf, int nloops);
 
     //! mMS2mOSrun calculates \f$M_{OS}\f$ from \f$m_{MS}^{(n_f)}(\mu)\f$
@@ -645,7 +632,7 @@ class CRunDec
         \param nloops number of loops
         \return \f$M_{OS}\f$
     */  
-    double mMS2mOSrun(double mMS, RunDecPair mq[],
+    double mMS2mOSrun(double mMS, std::pair<double,double>* mq,
                       double asmu, double mu,int nf, int nloops);
 
     //! mMS2mRI calculates \f$m^{RI}(\mu)\f$ from \f$m_{MS}^{(n_f)}(\mu)\f$
@@ -670,7 +657,7 @@ class CRunDec
         \param nloops number of loops
         \return \f$m_{MS}^{(n_f)}(\mu)\f$
     */  
-    double mOS2mMSit(double mOS, RunDecPair mq[],
+    double mOS2mMSit(double mOS, std::pair<double,double>* mq,
                      double asmu, double mu, int nf, int nloops);
 
     //! mMS2mRGImod calculates \f$m^{RGI}\f$ from \f$m_{MS}^{(n_f)}(\mu)\f$
@@ -697,7 +684,7 @@ class CRunDec
         \param nloops number of loops
         \return \f$m^{PS}(\mu_f)\f$
     */ 
-    double mOS2mPS(double mOS, RunDecPair mq[],
+    double mOS2mPS(double mOS, std::pair<double,double>* mq,
                    double asmu, double mu, double muf, int nl, int nloops);
 
     //! mMS2mPS calculates \f$m^{PS}(\mu_f)\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
@@ -712,7 +699,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m^{PS}(\mu_f)\f$
     */
-    double mMS2mPS(double mMS, RunDecPair mq[],
+    double mMS2mPS(double mMS, std::pair<double,double>* mq,
                    double asmu, double mu, double muf, int nl, int nloops, double fdelm=1.0);
 
     //! mPS2mMS calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m^{PS}(\mu_f)\f$
@@ -727,7 +714,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
     */
-    double mPS2mMS(double mPS, RunDecPair mq[],
+    double mPS2mMS(double mPS, std::pair<double,double>* mq,
                    double asmu, double mu, double muf, int nl, int nloops, double fdelm=1.0);
 
     //! mPS2mSI calculates \f$m_{MS}^{(n_l+1)}(m_{MS})\f$ from \f$m^{PS}(\mu_f)\f$
@@ -741,7 +728,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m_{MS}^{(n_l+1)}(m_{MS})\f$
     */
-    double mPS2mSI(double mPS, RunDecPair mq[],
+    double mPS2mSI(double mPS, std::pair<double,double>* mq,
                    double (*as)(double), double muf, int nl, int nloops, double fdelm=1.0);
 
     //! mOS2m1S calculates \f$m^{1S}\f$ from \f$M_{OS}\f$
@@ -754,7 +741,7 @@ class CRunDec
         \param nloops number of loops
         \return \f$m^{1S}\f$
     */ 
-    double mOS2m1S(double mOS, RunDecPair mq[],
+    double mOS2m1S(double mOS, std::pair<double,double>* mq,
                    double asmu, double mu, int nl, int nloops);
 
     //! mMS2m1S calculates \f$m^{1S}\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
@@ -768,7 +755,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m^{1S}\f$
     */
-    double mMS2m1S(double mMS, RunDecPair mq[],
+    double mMS2m1S(double mMS, std::pair<double,double>* mq,
                    double asmu, double mu, int nl, int nloops, double fdelm=1.0);
 
     //! m1S2mMS calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m^{1S}\f$
@@ -782,7 +769,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
     */
-    double m1S2mMS(double m1S, RunDecPair mq[],
+    double m1S2mMS(double m1S, std::pair<double,double>* mq,
                    double asmu, double mu, int nl, int nloops, double fdelm=1.0);
 
     //! m1S2mSI calculates \f$m_{MS}^{(n_l+1)}(m_{MS})\f$ from \f$m^{1S}\f$
@@ -795,7 +782,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m_{MS}^{(n_l+1)}(m_{MS})\f$
     */
-    double m1S2mSI(double m1S, RunDecPair mq[],
+    double m1S2mSI(double m1S, std::pair<double,double>* mq,
                    double (*as)(double), int nl, int nloops, double fdelm=1.0);
 
     //! mOS2mRS calculates \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$ from \f$M_{OS}\f$
@@ -812,7 +799,7 @@ class CRunDec
         \param prime selects if \f$m^{RS}\f$ or \f$m^{RS'}\f$ should be calculated
         \return \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$
     */ 
-    double mOS2mRS(double mOS, RunDecPair mq[], double asmu,
+    double mOS2mRS(double mOS, std::pair<double,double>* mq, double asmu,
                    double mu, double nuf, int nl, int nloops, bool prime);
 
     //! mMS2mRS calculates \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
@@ -830,7 +817,7 @@ class CRunDec
         \param prime selects if \f$m^{RS}\f$ or \f$m^{RS'}\f$ should be calculated
         \return \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$
     */ 
-    double mMS2mRS(double mMS, RunDecPair mq[], double asmu,
+    double mMS2mRS(double mMS, std::pair<double,double>* mq, double asmu,
                    double mu, double nuf, int nl, int nloops, double fdelm, bool prime);
 
     //! mRS2mMS calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$
@@ -848,7 +835,7 @@ class CRunDec
         \param prime selects if \f$m^{RS}\f$ or \f$m^{RS'}\f$ is given
         \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
     */ 
-    double mRS2mMS(double mRS, RunDecPair mq[], double asmu,
+    double mRS2mMS(double mRS, std::pair<double,double>* mq, double asmu,
                    double mu, double nuf, int nl, int nloops, double fdelm, bool prime);
 
     //! mRS2mSI calculates \f$m_{MS}^{(n_l+1)}(m_{MS})\f$ from \f$m^{RS}(\nu_f)\f$ or \f$m^{RS'}(\nu_f)\f$
@@ -865,7 +852,7 @@ class CRunDec
         \param prime selects if \f$m^{RS}\f$ or \f$m^{RS'}\f$ is given
         \return \f$m_{MS}^{(n_l+1)}(m_{MS})\f$
     */
-    double mRS2mSI(double mRS, RunDecPair mq[], double (*as)(double),
+    double mRS2mSI(double mRS, std::pair<double,double>* mq, double (*as)(double),
                    double nuf, int nl, int nloops, double fdelm, bool prime);
 
 
@@ -881,7 +868,7 @@ class CRunDec
         \param nloops number of loops
         \return \f$m^{RS}(\nu_f)\f$
     */ 
-    double mOS2mRS(double mOS, RunDecPair mq[],
+    double mOS2mRS(double mOS, std::pair<double,double>* mq,
                    double asmu, double mu, double nuf, int nl, int nloops);
 
     //! mMS2mRS calculates \f$m^{RS}(\nu_f)\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
@@ -897,7 +884,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m^{RS}(\nu_f)\f$
     */ 
-    double mMS2mRS(double mMS, RunDecPair mq[],
+    double mMS2mRS(double mMS, std::pair<double,double>* mq,
                    double asmu, double mu, double nuf, int nl, int nloops, double fdelm=1.0);
 
     //! mRS2mMS calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m^{RS}(\nu_f)\f$
@@ -913,7 +900,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
     */ 
-    double mRS2mMS(double mRS, RunDecPair mq[],
+    double mRS2mMS(double mRS, std::pair<double,double>* mq,
                    double asmu, double mu, double nuf, int nl, int nloops, double fdelm=1.0);
 
     //! mRS2mSI calculates \f$m_{MS}^{(n_l+1)}(m_{MS})\f$ from \f$m^{RS}(\nu_f)\f$
@@ -928,7 +915,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m_{MS}^{(n_l+1)}(m_{MS})\f$
     */
-    double mRS2mSI(double mRS, RunDecPair mq[],
+    double mRS2mSI(double mRS, std::pair<double,double>* mq,
                    double (*as)(double), double nuf, int nl, int nloops, double fdelm=1.0);
 
     //! mOS2mRSp calculates \f$m^{RS'}(\nu_f)\f$ from \f$M_{OS}\f$
@@ -943,7 +930,7 @@ class CRunDec
         \param nloops number of loops
         \return \f$m^{RS'}(\nu_f)\f$
     */ 
-    double mOS2mRSp(double mOS, RunDecPair mq[],
+    double mOS2mRSp(double mOS, std::pair<double,double>* mq,
                     double asmu, double mu, double nuf, int nl, int nloops);
 
     //! mMS2mRSp calculates \f$m^{RS'}(\nu_f)\f$ from \f$m_{MS}^{(n_l+1)}(\mu)\f$
@@ -959,7 +946,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m^{RS'}(\nu_f)\f$
     */ 
-    double mMS2mRSp(double mMS, RunDecPair mq[],
+    double mMS2mRSp(double mMS, std::pair<double,double>* mq,
                     double asmu, double mu, double nuf, int nl, int nloops, double fdelm=1.0);
 
     //! mRSp2mMS calculates \f$m_{MS}^{(n_l+1)}(\mu)\f$ from \f$m^{RS'}(\nu_f)\f$
@@ -975,7 +962,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m_{MS}^{(n_l+1)}(\mu)\f$
     */ 
-    double mRSp2mMS(double mRS, RunDecPair mq[],
+    double mRSp2mMS(double mRS, std::pair<double,double>* mq,
                     double asmu, double mu, double nuf, int nl, int nloops, double fdelm=1.0);
 
     //! mRSp2mSI calculates \f$m_{MS}^{(n_l+1)}(m_{MS})\f$ from \f$m^{RS'}(\nu_f)\f$
@@ -990,7 +977,7 @@ class CRunDec
         \param fdelm factor multiplying the non-logarithmic part of the 4-loop term
         \return \f$m_{MS}^{(n_l+1)}(m_{MS})\f$
     */
-    double mRSp2mSI(double mRS, RunDecPair mq[],
+    double mRSp2mSI(double mRS, std::pair<double,double>* mq,
                     double (*as)(double), double nuf, int nl, int nloops, double fdelm=1.0);
 
 
@@ -1009,8 +996,8 @@ class CRunDec
         \param deccase Specify if there is a light but massive quark
         \return \f$m^{\mathrm{kin}}\f$
     */ 
-    double mMS2mKIN(double mMS, RunDecPair mq[],
-                    double asmus, double mus, double muf, int nlmsos, int nloskin, int nloops, int deccase);
+    double mMS2mKIN(double mMS, std::pair<double,double>* mq,
+                    double asmus, double mus, double muf, int nlmsos, int nloskin, int nloops, std::string deccase);
 
     //! mKIN2mMS calculates \f$m_{MS}^{(n_f)}(\mu_s)\f$ from \f$m^{\mathrm{kin}}\f$
 
@@ -1026,8 +1013,8 @@ class CRunDec
         \param deccase Specify if there is a light but massive quark
         \return \f$m_{MS}^{(n_f)}(\mu_s)\f$
     */ 
-    double mKIN2mMS(double mKIN, RunDecPair mq[],
-                    double asmus, double mus, double muf, int nlmsos, int nloskin, int nloops, int deccase);
+    double mKIN2mMS(double mKIN, std::pair<double,double>* mq,
+                    double asmus, double mus, double muf, int nlmsos, int nloskin, int nloops, std::string deccase);
   
     // Overload functions:
     double LamExpl(double asmu, double mu, int nloops);
@@ -1053,28 +1040,28 @@ class CRunDec
     double DecMqDownSI(double mq, double asmu, double massth, double muth, int nloops);    
 
 
-    double mMS2mOS(double mMS, RunDecPair mq[],
+    double mMS2mOS(double mMS, std::pair<double,double>* mq,
                    double asmu, double mu, int nloops, double fdelm=1.0);
-    double mOS2mMS(double mOS, RunDecPair mq[],
+    double mOS2mMS(double mOS, std::pair<double,double>* mq,
                    double asmu, double mu, int nloops, double fdelm=1.0);
 
     double mMS2mSI(double mMS, double asmu, double mu, int nloops);
     double mRI2mMS(double mRI, double asmu, int nloops);
     double mMS2mRGI(double mMS, double asmu, int nloops);
     double mRGI2mMS(double mRGI, double asmu, int nloops);
-    double mOS2mSI(double mOS, RunDecPair mq[],
+    double mOS2mSI(double mOS, std::pair<double,double>* mq,
                    double asM, int nloops, double fdelm=1.0);
-    double mOS2mMSrun(double mOS, RunDecPair mq[],
+    double mOS2mMSrun(double mOS, std::pair<double,double>* mq,
                       double asmu, double mu, int nloops);
-    double mMS2mOSrun(double mMS, RunDecPair mq[],
+    double mMS2mOSrun(double mMS, std::pair<double,double>* mq,
                       double asmu, double mu, int nloops);
     double mMS2mRI(double mMS, double asmu, int nloops);
-    double mOS2mMSit(double mOS, RunDecPair mq[],
+    double mOS2mMSit(double mOS, std::pair<double,double>* mq,
                      double asmu, double mu, int nloops); 
     double mMS2mRGImod(double mMS, double asmu, int nloops);
 
-    double mMS2mKIN(double mMS, RunDecPair mq[], double asmus, double mus, double muf, int nloops, int deccase);
-    double mKIN2mMS(double mKIN, RunDecPair mq[], double asmus, double mus, double muf, int nloops, int deccase);
+    double mMS2mKIN(double mMS, std::pair<double,double>* mq, double asmus, double mus, double muf, int nloops, std::string deccase);
+    double mKIN2mMS(double mKIN, std::pair<double,double>* mq, double asmus, double mus, double muf, int nloops, std::string deccase);
 
 };
 
diff --git a/README.md b/README.md
index 6481b15..d6fdc15 100644
--- a/README.md
+++ b/README.md
@@ -58,4 +58,21 @@ The wrapper was generated with [SWIG](http://www.swig.org/).
 
 Binary wheels are provided via [PyPI](https://pypi.python.org/pypi/rundec) for Linux, macOS, and Windows (built with [GitHub Actions](https://github.com/features/actions)).
 
-Python 3.10+ is supported.
\ No newline at end of file
+Python 3.10+ is supported.
+
+## Updating CRunDec version
+
+To update to a new version of CRunDec:
+
+1. Replace the CRunDec source files in the `CRunDec3/` directory with the new version, renaming them to `CRunDec.cpp` and `CRunDec.h`
+
+2. Update `setup.py` to reference the correct source files
+
+3. Check if `rundec.i` needs updates for any API changes (e.g., new types, changed function signatures)
+
+4. Regenerate the wrapper and test:
+   ```bash
+   make
+   pip install -e .
+   pytest test/
+   ```
diff --git a/_rundec.cc b/_rundec.cc
index db27e7e..7674e5d 100644
--- a/_rundec.cc
+++ b/_rundec.cc
@@ -3381,7 +3381,13 @@ namespace swig {
 #include <stdlib.h>
 #include <utility>
 
-#include "CRunDec3/CRunDec.3.1.h"
+#include "CRunDec3/CRunDec.h"
+
+// Define RunDecPair as typedef for compatibility
+typedef std::pair<double,double> RunDecPair;
+
+
+#include <string>
 
 
 #include <typeinfo>
@@ -3395,9 +3401,6 @@ namespace swig {
 #endif
 
 
-#include <string>
-
-
 #include <stddef.h>
 
 
@@ -3901,9 +3904,6 @@ SWIG_AsVal_ptrdiff_t (PyObject * obj, ptrdiff_t *val)
 #include <vector>
 
 
-  #define SWIG_From_double   PyFloat_FromDouble 
-
-
 namespace swig {
   template <class Type>
   struct noconst_traits {
@@ -4181,191 +4181,6 @@ namespace swig {
 }
 
 
-namespace swig {
-  template <> struct traits< double > {
-    typedef value_category category;
-    static const char* type_name() { return"double"; }
-  };
-  template <>  struct traits_asval< double > {
-    typedef double value_type;
-    static int asval(PyObject *obj, value_type *val) {
-      return SWIG_AsVal_double (obj, val);
-    }
-  };
-  template <>  struct traits_from< double > {
-    typedef double value_type;
-    static PyObject *from(const value_type& val) {
-      return SWIG_From_double  (val);
-    }
-  };
-}
-
-
-  namespace swig {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    template <class T, class U >
-    struct traits_asptr<std::pair<T,U> >  {
-      typedef std::pair<T,U> value_type;
-
-      static int get_pair(PyObject* first, PyObject* second,
-			  std::pair<T,U> **val) 
-      {
-	if (val) {
-	  value_type *vp = (new std::pair<T,U>());
-	  T *pfirst = &(vp->first);
-	  int res1 = swig::asval((PyObject*)first, pfirst);
-	  if (!SWIG_IsOK(res1)) {
-	    delete vp;
-	    return res1;
-	  }
-	  U *psecond = &(vp->second);
-	  int res2 = swig::asval((PyObject*)second, psecond);
-	  if (!SWIG_IsOK(res2)) {
-	    delete vp;
-	    return res2;
-	  }
-	  *val = vp;
-	  return SWIG_AddNewMask(res1 > res2 ? res1 : res2);
-	} else {
-	  T *pfirst = 0;
-	  int res1 = swig::asval((PyObject*)first, pfirst);
-	  if (!SWIG_IsOK(res1)) return res1;
-	  U *psecond = 0;
-	  int res2 = swig::asval((PyObject*)second, psecond);
-	  if (!SWIG_IsOK(res2)) return res2;
-	  return res1 > res2 ? res1 : res2;
-	}
-      }
-
-      static int asptr(PyObject *obj, std::pair<T,U> **val) {
-	int res = SWIG_ERROR;
-	if (PyTuple_Check(obj)) {
-	  if (PyTuple_GET_SIZE(obj) == 2) {
-	    res = get_pair(PyTuple_GET_ITEM(obj,0),PyTuple_GET_ITEM(obj,1), val);
-	  }
-	} else if (PySequence_Check(obj)) {
-	  if (PySequence_Size(obj) == 2) {
-	    swig::SwigVar_PyObject first = PySequence_GetItem(obj,0);
-	    swig::SwigVar_PyObject second = PySequence_GetItem(obj,1);
-	    res = get_pair(first, second, val);
-	  }
-	} else {
-	  value_type *p = 0;
-	  swig_type_info *descriptor = swig::type_info<value_type>();
-	  res = descriptor ? SWIG_ConvertPtr(obj, (void **)&p, descriptor, 0) : SWIG_ERROR;
-	  if (SWIG_IsOK(res) && val)  *val = p;
-	}
-	return res;
-      }
-    };
-
-
-    template <class T, class U >
-    struct traits_from<std::pair<T,U> >   {
-      static PyObject *from(const std::pair<T,U>& val) {
-	PyObject* obj = PyTuple_New(2);
-	PyTuple_SetItem(obj,0,swig::from(val.first));
-	PyTuple_SetItem(obj,1,swig::from(val.second));
-	return obj;
-      }
-    };
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-      namespace swig {
-	template <>  struct traits<std::pair< double, double > > {
-	  typedef pointer_category category;
-	  static const char* type_name() {
-	    return "std::pair<" "double" "," "double" " >";
-	  }
-	};
-      }
-    
-
 #if defined(__SUNPRO_CC) && defined(_RWSTD_VER)
 #  if !defined(SWIG_NO_STD_NOITERATOR_TRAITS_STL)
 #    define SWIG_STD_NOITERATOR_TRAITS_STL
@@ -4635,6 +4450,14 @@ namespace swig {
 }
 
 
+  namespace swig {
+    template <>  struct traits< std::pair< double,double > > {
+      typedef pointer_category category;
+      static const char* type_name() { return"std::pair< double,double >"; }
+    };
+  }
+
+
 #include <functional>
 
 namespace std {
@@ -5242,6 +5065,9 @@ SWIGINTERN std::vector< std::pair< double,double > >::iterator std_vector_Sl_std
 SWIGINTERN std::vector< std::pair< double,double > >::iterator std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_0(std::vector< std::pair< double,double > > *self,std::vector< std::pair< double,double > >::iterator pos,std::vector< std::pair< double,double > >::value_type const &x){ return self->insert(pos, x); }
 SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_1(std::vector< std::pair< double,double > > *self,std::vector< std::pair< double,double > >::iterator pos,std::vector< std::pair< double,double > >::size_type n,std::vector< std::pair< double,double > >::value_type const &x){ self->insert(pos, n, x); }
 
+  #define SWIG_From_double   PyFloat_FromDouble 
+
+
 typedef TriplenfMmu TriplenfMmuArray;
 
 SWIGINTERN TriplenfMmuArray *new_TriplenfMmuArray(size_t nelements){
@@ -5320,6 +5146,131 @@ SWIG_AsVal_bool (PyObject *obj, bool *val)
   return SWIG_OK;
 }
 
+
+SWIGINTERN swig_type_info*
+SWIG_pchar_descriptor(void)
+{
+  static swig_type_info* info = 0;
+  if (!info) {
+    info = SWIG_TypeQuery("_p_char");
+  }
+  return info;
+}
+
+
+/* Return string from Python obj. NOTE: obj must remain in scope in order
+   to use the returned cptr (but only when alloc is set to SWIG_OLDOBJ) */
+SWIGINTERN int
+SWIG_AsCharPtrAndSize(PyObject *obj, char **cptr, size_t *psize, int *alloc)
+{
+#if PY_VERSION_HEX>=0x03000000
+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+  if (PyBytes_Check(obj))
+#else
+  if (PyUnicode_Check(obj))
+#endif
+#else  
+  if (PyString_Check(obj))
+#endif
+  {
+    char *cstr; Py_ssize_t len;
+    PyObject *bytes = NULL;
+    int ret = SWIG_OK;
+    if (alloc)
+      *alloc = SWIG_OLDOBJ;
+#if PY_VERSION_HEX>=0x03000000 && defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+    if (PyBytes_AsStringAndSize(obj, &cstr, &len) == -1)
+      return SWIG_TypeError;
+#else
+    cstr = (char *)SWIG_PyUnicode_AsUTF8AndSize(obj, &len, &bytes);
+    if (!cstr)
+      return SWIG_TypeError;
+    /* The returned string is only duplicated if the char * returned is not owned and memory managed by obj */
+    if (bytes && cptr) {
+      if (alloc) {
+        cstr = reinterpret_cast< char* >(memcpy(new char[len + 1], cstr, sizeof(char)*(len + 1)));
+        *alloc = SWIG_NEWOBJ;
+      } else {
+        /* alloc must be set in order to clean up allocated memory */
+        return SWIG_RuntimeError;
+      }
+    }
+#endif
+    if (cptr) *cptr = cstr;
+    if (psize) *psize = len + 1;
+    SWIG_Py_XDECREF(bytes);
+    return ret;
+  } else {
+#if defined(SWIG_PYTHON_2_UNICODE)
+#if defined(SWIG_PYTHON_STRICT_BYTE_CHAR)
+#error "Cannot use both SWIG_PYTHON_2_UNICODE and SWIG_PYTHON_STRICT_BYTE_CHAR at once"
+#endif
+#if PY_VERSION_HEX<0x03000000
+    if (PyUnicode_Check(obj)) {
+      char *cstr; Py_ssize_t len;
+      if (!alloc && cptr) {
+        return SWIG_RuntimeError;
+      }
+      obj = PyUnicode_AsUTF8String(obj);
+      if (!obj)
+        return SWIG_TypeError;
+      if (PyString_AsStringAndSize(obj, &cstr, &len) != -1) {
+        if (cptr) {
+          if (alloc) *alloc = SWIG_NEWOBJ;
+          *cptr = reinterpret_cast< char* >(memcpy(new char[len + 1], cstr, sizeof(char)*(len + 1)));
+        }
+        if (psize) *psize = len + 1;
+
+        SWIG_Py_XDECREF(obj);
+        return SWIG_OK;
+      } else {
+        SWIG_Py_XDECREF(obj);
+      }
+    }
+#endif
+#endif
+
+    swig_type_info* pchar_descriptor = SWIG_pchar_descriptor();
+    if (pchar_descriptor) {
+      void* vptr = 0;
+      if (SWIG_ConvertPtr(obj, &vptr, pchar_descriptor, 0) == SWIG_OK) {
+	if (cptr) *cptr = (char *) vptr;
+	if (psize) *psize = vptr ? (strlen((char *)vptr) + 1) : 0;
+	if (alloc) *alloc = SWIG_OLDOBJ;
+	return SWIG_OK;
+      }
+    }
+  }
+  return SWIG_TypeError;
+}
+
+
+SWIGINTERN int
+SWIG_AsPtr_std_string (PyObject * obj, std::string **val) 
+{
+  char* buf = 0 ; size_t size = 0; int alloc = SWIG_OLDOBJ;
+  if (SWIG_IsOK((SWIG_AsCharPtrAndSize(obj, &buf, &size, &alloc)))) {
+    if (buf) {
+      if (val) *val = new std::string(buf, size - 1);
+      if (alloc == SWIG_NEWOBJ) delete[] buf;
+      return SWIG_NEWOBJ;
+    } else {
+      if (val) *val = 0;
+      return SWIG_OLDOBJ;
+    }
+  } else {
+    PyErr_Clear();
+    static swig_type_info *descriptor = SWIG_TypeQuery("std::string" " *");
+    if (descriptor) {
+      std::string *vptr;
+      int res = SWIG_ConvertPtr(obj, (void**)&vptr, descriptor, 0);
+      if (SWIG_IsOK(res) && val) *val = vptr;
+      return res;
+    }
+  }
+  return SWIG_ERROR;
+}
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -6164,318 +6115,57 @@ SWIGINTERN PyObject *SwigPyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self),
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *_wrap_new_PairDouble__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+SWIGINTERN PyObject *_wrap_PairDoubleVector_iterator(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  std::pair< double,double > *result = 0 ;
+  std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
+  PyObject **arg2 = (PyObject **) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  swig::SwigPyIterator *result = 0 ;
   
+  arg2 = &swig_obj[0];
   (void)self;
-  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
-  result = (std::pair< double,double > *)new std::pair< double,double >();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_NEW |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDoubleVector_iterator" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
+  result = (swig::SwigPyIterator *)std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__iterator(arg1,arg2);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_new_PairDouble__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_PairDoubleVector___nonzero__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  double arg1 ;
-  double arg2 ;
-  double val1 ;
-  int ecode1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  std::pair< double,double > *result = 0 ;
+  std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  bool result;
   
   (void)self;
-  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
-  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_PairDouble" "', argument " "1"" of type '" "double""'");
-  } 
-  arg1 = static_cast< double >(val1);
-  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_PairDouble" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = static_cast< double >(val2);
-  result = (std::pair< double,double > *)new std::pair< double,double >(arg1,arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_NEW |  0 );
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDoubleVector___nonzero__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
+  result = (bool)std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____nonzero__((std::vector< std::pair< double,double > > const *)arg1);
+  resultobj = SWIG_From_bool(static_cast< bool >(result));
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_new_PairDouble__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
-  PyObject *resultobj = 0;
-  std::pair< double,double > *arg1 = 0 ;
-  int res1 = SWIG_OLDOBJ ;
-  std::pair< double,double > *result = 0 ;
-  
-  (void)self;
-  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
-  {
-    std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res1 = swig::asptr(swig_obj[0], &ptr);
-    if (!SWIG_IsOK(res1)) {
-      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_PairDouble" "', argument " "1"" of type '" "std::pair< double,double > const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "new_PairDouble" "', argument " "1"" of type '" "std::pair< double,double > const &""'"); 
-    }
-    arg1 = ptr;
-  }
-  result = (std::pair< double,double > *)new std::pair< double,double >((std::pair< double,double > const &)*arg1);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_NEW |  0 );
-  if (SWIG_IsNewObj(res1)) delete arg1;
-  return resultobj;
-fail:
-  if (SWIG_IsNewObj(res1)) delete arg1;
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_PairDouble(PyObject *self, PyObject *args) {
-  Py_ssize_t argc;
-  PyObject *argv[3] = {
-    0
-  };
-  
-  if (!(argc = SWIG_Python_UnpackTuple(args, "new_PairDouble", 0, 2, argv))) SWIG_fail;
-  --argc;
-  if (argc == 0) {
-    return _wrap_new_PairDouble__SWIG_0(self, argc, argv);
-  }
-  if (argc == 1) {
-    int _v = 0;
-    int res = swig::asptr(argv[0], (std::pair< double,double >**)(0));
-    _v = SWIG_CheckState(res);
-    if (_v) {
-      return _wrap_new_PairDouble__SWIG_2(self, argc, argv);
-    }
-  }
-  if (argc == 2) {
-    int _v = 0;
-    {
-      int res = SWIG_AsVal_double(argv[0], NULL);
-      _v = SWIG_CheckState(res);
-    }
-    if (_v) {
-      {
-        int res = SWIG_AsVal_double(argv[1], NULL);
-        _v = SWIG_CheckState(res);
-      }
-      if (_v) {
-        return _wrap_new_PairDouble__SWIG_1(self, argc, argv);
-      }
-    }
-  }
-  
-fail:
-  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_PairDouble'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    std::pair< double,double >::pair()\n"
-    "    std::pair< double,double >::pair(double,double)\n"
-    "    std::pair< double,double >::pair(std::pair< double,double > const &)\n");
-  return 0;
-}
-
-
-SWIGINTERN PyObject *_wrap_PairDouble_first_set(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
-  double arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "PairDouble_first_set", 2, 2, swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDouble_first_set" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
-  }
-  arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PairDouble_first_set" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = static_cast< double >(val2);
-  if (arg1) (arg1)->first = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_PairDouble_first_get(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  double result;
-  
-  (void)self;
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDouble_first_get" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
-  }
-  arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
-  result = (double) ((arg1)->first);
-  resultobj = SWIG_From_double(static_cast< double >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_PairDouble_second_set(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
-  double arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "PairDouble_second_set", 2, 2, swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDouble_second_set" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
-  }
-  arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
-  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PairDouble_second_set" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = static_cast< double >(val2);
-  if (arg1) (arg1)->second = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_PairDouble_second_get(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  double result;
-  
-  (void)self;
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDouble_second_get" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
-  }
-  arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
-  result = (double) ((arg1)->second);
-  resultobj = SWIG_From_double(static_cast< double >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_PairDouble(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  (void)self;
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PairDouble" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
-  }
-  arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *PairDouble_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj = NULL;
-  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__pairT_double_double_t, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *PairDouble_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
-SWIGINTERN PyObject *_wrap_PairDoubleVector_iterator(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
-  PyObject **arg2 = (PyObject **) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  swig::SwigPyIterator *result = 0 ;
-  
-  arg2 = &swig_obj[0];
-  (void)self;
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDoubleVector_iterator" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  result = (swig::SwigPyIterator *)std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__iterator(arg1,arg2);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_swig__SwigPyIterator, SWIG_POINTER_OWN |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_PairDoubleVector___nonzero__(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  bool result;
-  
-  (void)self;
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDoubleVector___nonzero__" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
-  }
-  arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  result = (bool)std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____nonzero__((std::vector< std::pair< double,double > > const *)arg1);
-  resultobj = SWIG_From_bool(static_cast< bool >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_PairDoubleVector___bool__(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_PairDoubleVector___bool__(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
   void *argp1 = 0 ;
@@ -7034,7 +6724,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___getitem____SWIG_1(PyObject *self,
   } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  resultobj = swig::from(static_cast< std::pair< double,double > >(*result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
   (void)swig::container_owner<swig::traits<std::vector< std::pair< double,double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
@@ -7096,7 +6786,8 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___setitem____SWIG_2(PyObject *self,
   int res1 = 0 ;
   ptrdiff_t val2 ;
   int ecode2 = 0 ;
-  int res3 = SWIG_OLDOBJ ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   
   (void)self;
   if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
@@ -7110,27 +6801,22 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___setitem____SWIG_2(PyObject *self,
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PairDoubleVector___setitem__" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::difference_type""'");
   } 
   arg2 = static_cast< std::vector< std::pair< double,double > >::difference_type >(val2);
-  {
-    std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res3 = swig::asptr(swig_obj[2], &ptr);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    arg3 = ptr;
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_std__pairT_double_double_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
+  }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector___setitem__" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
   }
+  arg3 = reinterpret_cast< std::vector< std::pair< double,double > >::value_type * >(argp3);
   try {
     std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg____setitem____SWIG_2(arg1,SWIG_STD_MOVE(arg2),(std::pair< double,double > const &)*arg3);
   } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
   resultobj = SWIG_Py_Void();
-  if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
 fail:
-  if (SWIG_IsNewObj(res3)) delete arg3;
   return NULL;
 }
 
@@ -7183,7 +6869,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector___setitem__(PyObject *self, PyObject
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = swig::asptr(argv[2], (std::pair< double,double >**)(0));
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_PairDoubleVector___setitem____SWIG_2(self, argc, argv);
@@ -7223,7 +6909,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_pop(PyObject *self, PyObject *args)
   } catch(std::out_of_range &_e) {
     SWIG_exception_fail(SWIG_IndexError, (&_e)->what());
   }
-  resultobj = swig::from(static_cast< std::pair< double,double > >(result));
+  resultobj = SWIG_NewPointerObj((new std::vector< std::pair< double,double > >::value_type(result)), SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_OWN |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -7236,7 +6922,8 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_append(PyObject *self, PyObject *arg
   std::vector< std::pair< double,double > >::value_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int res2 = SWIG_OLDOBJ ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   PyObject *swig_obj[2] ;
   
   (void)self;
@@ -7246,23 +6933,18 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_append(PyObject *self, PyObject *arg
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDoubleVector_append" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  {
-    std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res2 = swig::asptr(swig_obj[1], &ptr);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PairDoubleVector_append" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_append" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    arg2 = ptr;
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__pairT_double_double_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PairDoubleVector_append" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_append" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
   }
+  arg2 = reinterpret_cast< std::vector< std::pair< double,double > >::value_type * >(argp2);
   std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__append(arg1,(std::pair< double,double > const &)*arg2);
   resultobj = SWIG_Py_Void();
-  if (SWIG_IsNewObj(res2)) delete arg2;
   return resultobj;
 fail:
-  if (SWIG_IsNewObj(res2)) delete arg2;
   return NULL;
 }
 
@@ -7755,7 +7437,8 @@ SWIGINTERN PyObject *_wrap_new_PairDoubleVector__SWIG_3(PyObject *self, Py_ssize
   std::vector< std::pair< double,double > >::value_type *arg2 = 0 ;
   size_t val1 ;
   int ecode1 = 0 ;
-  int res2 = SWIG_OLDOBJ ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   std::vector< std::pair< double,double > > *result = 0 ;
   
   (void)self;
@@ -7765,23 +7448,18 @@ SWIGINTERN PyObject *_wrap_new_PairDoubleVector__SWIG_3(PyObject *self, Py_ssize
     SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_PairDoubleVector" "', argument " "1"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
   } 
   arg1 = static_cast< std::vector< std::pair< double,double > >::size_type >(val1);
-  {
-    std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res2 = swig::asptr(swig_obj[1], &ptr);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_PairDoubleVector" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "new_PairDoubleVector" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    arg2 = ptr;
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__pairT_double_double_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_PairDoubleVector" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "new_PairDoubleVector" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
   }
+  arg2 = reinterpret_cast< std::vector< std::pair< double,double > >::value_type * >(argp2);
   result = (std::vector< std::pair< double,double > > *)new std::vector< std::pair< double,double > >(SWIG_STD_MOVE(arg1),(std::vector< std::pair< double,double > >::value_type const &)*arg2);
   resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, SWIG_POINTER_NEW |  0 );
-  if (SWIG_IsNewObj(res2)) delete arg2;
   return resultobj;
 fail:
-  if (SWIG_IsNewObj(res2)) delete arg2;
   return NULL;
 }
 
@@ -7822,7 +7500,7 @@ SWIGINTERN PyObject *_wrap_new_PairDoubleVector(PyObject *self, PyObject *args)
       _v = SWIG_CheckState(res);
     }
     if (_v) {
-      int res = swig::asptr(argv[1], (std::pair< double,double >**)(0));
+      int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_NO_NULL | 0);
       _v = SWIG_CheckState(res);
       if (_v) {
         return _wrap_new_PairDoubleVector__SWIG_3(self, argc, argv);
@@ -7847,7 +7525,8 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_push_back(PyObject *self, PyObject *
   std::vector< std::pair< double,double > >::value_type *arg2 = 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  int res2 = SWIG_OLDOBJ ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
   PyObject *swig_obj[2] ;
   
   (void)self;
@@ -7857,23 +7536,18 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_push_back(PyObject *self, PyObject *
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDoubleVector_push_back" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  {
-    std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res2 = swig::asptr(swig_obj[1], &ptr);
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PairDoubleVector_push_back" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_push_back" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    arg2 = ptr;
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_std__pairT_double_double_t,  0  | 0);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "PairDoubleVector_push_back" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
+  }
+  if (!argp2) {
+    SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_push_back" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
   }
+  arg2 = reinterpret_cast< std::vector< std::pair< double,double > >::value_type * >(argp2);
   (arg1)->push_back((std::vector< std::pair< double,double > >::value_type const &)*arg2);
   resultobj = SWIG_Py_Void();
-  if (SWIG_IsNewObj(res2)) delete arg2;
   return resultobj;
 fail:
-  if (SWIG_IsNewObj(res2)) delete arg2;
   return NULL;
 }
 
@@ -7895,7 +7569,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_front(PyObject *self, PyObject *args
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
   result = (std::vector< std::pair< double,double > >::value_type *) &((std::vector< std::pair< double,double > > const *)arg1)->front();
-  resultobj = swig::from(static_cast< std::pair< double,double > >(*result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
   (void)swig::container_owner<swig::traits<std::vector< std::pair< double,double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
@@ -7920,7 +7594,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_back(PyObject *self, PyObject *args)
   }
   arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
   result = (std::vector< std::pair< double,double > >::value_type *) &((std::vector< std::pair< double,double > > const *)arg1)->back();
-  resultobj = swig::from(static_cast< std::pair< double,double > >(*result));
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
   (void)swig::container_owner<swig::traits<std::vector< std::pair< double,double > >::value_type>::category>::back_reference(resultobj, swig_obj[0]);
   return resultobj;
 fail:
@@ -7937,7 +7611,8 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_assign(PyObject *self, PyObject *arg
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  int res3 = SWIG_OLDOBJ ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   PyObject *swig_obj[3] ;
   
   (void)self;
@@ -7952,23 +7627,18 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_assign(PyObject *self, PyObject *arg
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PairDoubleVector_assign" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::pair< double,double > >::size_type >(val2);
-  {
-    std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res3 = swig::asptr(swig_obj[2], &ptr);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector_assign" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_assign" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    arg3 = ptr;
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_std__pairT_double_double_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector_assign" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
   }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_assign" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector< std::pair< double,double > >::value_type * >(argp3);
   (arg1)->assign(SWIG_STD_MOVE(arg2),(std::vector< std::pair< double,double > >::value_type const &)*arg3);
   resultobj = SWIG_Py_Void();
-  if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
 fail:
-  if (SWIG_IsNewObj(res3)) delete arg3;
   return NULL;
 }
 
@@ -7982,7 +7652,8 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_resize__SWIG_1(PyObject *self, Py_ss
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  int res3 = SWIG_OLDOBJ ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   
   (void)self;
   if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
@@ -7996,23 +7667,18 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_resize__SWIG_1(PyObject *self, Py_ss
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PairDoubleVector_resize" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
   } 
   arg2 = static_cast< std::vector< std::pair< double,double > >::size_type >(val2);
-  {
-    std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res3 = swig::asptr(swig_obj[2], &ptr);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector_resize" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_resize" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    arg3 = ptr;
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_std__pairT_double_double_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector_resize" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
   }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_resize" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector< std::pair< double,double > >::value_type * >(argp3);
   (arg1)->resize(SWIG_STD_MOVE(arg2),(std::vector< std::pair< double,double > >::value_type const &)*arg3);
   resultobj = SWIG_Py_Void();
-  if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
 fail:
-  if (SWIG_IsNewObj(res3)) delete arg3;
   return NULL;
 }
 
@@ -8049,7 +7715,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_resize(PyObject *self, PyObject *arg
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        int res = swig::asptr(argv[2], (std::pair< double,double >**)(0));
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_PairDoubleVector_resize__SWIG_1(self, argc, argv);
@@ -8076,7 +7742,8 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_insert__SWIG_0(PyObject *self, Py_ss
   int res1 = 0 ;
   swig::SwigPyIterator *iter2 = 0 ;
   int res2 ;
-  int res3 = SWIG_OLDOBJ ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
   std::vector< std::pair< double,double > >::iterator result;
   
   (void)self;
@@ -8097,24 +7764,19 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_insert__SWIG_0(PyObject *self, Py_ss
       SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "PairDoubleVector_insert" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::iterator""'");
     }
   }
-  {
-    std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res3 = swig::asptr(swig_obj[2], &ptr);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    arg3 = ptr;
+  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_std__pairT_double_double_t,  0  | 0);
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "PairDoubleVector_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
   }
+  if (!argp3) {
+    SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
+  }
+  arg3 = reinterpret_cast< std::vector< std::pair< double,double > >::value_type * >(argp3);
   result = std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_0(arg1,SWIG_STD_MOVE(arg2),(std::pair< double,double > const &)*arg3);
   resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< std::pair< double,double > >::iterator & >(result)),
     swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN);
-  if (SWIG_IsNewObj(res3)) delete arg3;
   return resultobj;
 fail:
-  if (SWIG_IsNewObj(res3)) delete arg3;
   return NULL;
 }
 
@@ -8131,7 +7793,8 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_insert__SWIG_1(PyObject *self, Py_ss
   int res2 ;
   size_t val3 ;
   int ecode3 = 0 ;
-  int res4 = SWIG_OLDOBJ ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
   
   (void)self;
   if ((nobjs < 4) || (nobjs > 4)) SWIG_fail;
@@ -8156,23 +7819,18 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_insert__SWIG_1(PyObject *self, Py_ss
     SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "PairDoubleVector_insert" "', argument " "3"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
   } 
   arg3 = static_cast< std::vector< std::pair< double,double > >::size_type >(val3);
-  {
-    std::pair< double,double > *ptr = (std::pair< double,double > *)0;
-    res4 = swig::asptr(swig_obj[3], &ptr);
-    if (!SWIG_IsOK(res4)) {
-      SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "PairDoubleVector_insert" "', argument " "4"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    if (!ptr) {
-      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_insert" "', argument " "4"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
-    }
-    arg4 = ptr;
+  res4 = SWIG_ConvertPtr(swig_obj[3], &argp4, SWIGTYPE_p_std__pairT_double_double_t,  0  | 0);
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "PairDoubleVector_insert" "', argument " "4"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
+  }
+  if (!argp4) {
+    SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "PairDoubleVector_insert" "', argument " "4"" of type '" "std::vector< std::pair< double,double > >::value_type const &""'"); 
   }
+  arg4 = reinterpret_cast< std::vector< std::pair< double,double > >::value_type * >(argp4);
   std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),(std::pair< double,double > const &)*arg4);
   resultobj = SWIG_Py_Void();
-  if (SWIG_IsNewObj(res4)) delete arg4;
   return resultobj;
 fail:
-  if (SWIG_IsNewObj(res4)) delete arg4;
   return NULL;
 }
 
@@ -8194,7 +7852,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_insert(PyObject *self, PyObject *arg
       int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0);
       _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::pair< double,double > >::iterator > *>(iter) != 0));
       if (_v) {
-        int res = swig::asptr(argv[2], (std::pair< double,double >**)(0));
+        int res = SWIG_ConvertPtr(argv[2], 0, SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_NO_NULL | 0);
         _v = SWIG_CheckState(res);
         if (_v) {
           return _wrap_PairDoubleVector_insert__SWIG_0(self, argc, argv);
@@ -8216,7 +7874,7 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_insert(PyObject *self, PyObject *arg
           _v = SWIG_CheckState(res);
         }
         if (_v) {
-          int res = swig::asptr(argv[3], (std::pair< double,double >**)(0));
+          int res = SWIG_ConvertPtr(argv[3], 0, SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_NO_NULL | 0);
           _v = SWIG_CheckState(res);
           if (_v) {
             return _wrap_PairDoubleVector_insert__SWIG_1(self, argc, argv);
@@ -8227,37 +7885,298 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_insert(PyObject *self, PyObject *arg
   }
   
 fail:
-  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'PairDoubleVector_insert'.\n"
-    "  Possible C/C++ prototypes are:\n"
-    "    std::vector< std::pair< double,double > >::insert(std::vector< std::pair< double,double > >::iterator,std::vector< std::pair< double,double > >::value_type const &)\n"
-    "    std::vector< std::pair< double,double > >::insert(std::vector< std::pair< double,double > >::iterator,std::vector< std::pair< double,double > >::size_type,std::vector< std::pair< double,double > >::value_type const &)\n");
-  return 0;
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'PairDoubleVector_insert'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::vector< std::pair< double,double > >::insert(std::vector< std::pair< double,double > >::iterator,std::vector< std::pair< double,double > >::value_type const &)\n"
+    "    std::vector< std::pair< double,double > >::insert(std::vector< std::pair< double,double > >::iterator,std::vector< std::pair< double,double > >::size_type,std::vector< std::pair< double,double > >::value_type const &)\n");
+  return 0;
+}
+
+
+SWIGINTERN PyObject *_wrap_PairDoubleVector_reserve(PyObject *self, PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
+  std::vector< std::pair< double,double > >::size_type arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  size_t val2 ;
+  int ecode2 = 0 ;
+  PyObject *swig_obj[2] ;
+  
+  (void)self;
+  if (!SWIG_Python_UnpackTuple(args, "PairDoubleVector_reserve", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDoubleVector_reserve" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
+  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PairDoubleVector_reserve" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
+  } 
+  arg2 = static_cast< std::vector< std::pair< double,double > >::size_type >(val2);
+  (arg1)->reserve(SWIG_STD_MOVE(arg2));
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_PairDoubleVector_capacity(PyObject *self, PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  std::vector< std::pair< double,double > >::size_type result;
+  
+  (void)self;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDoubleVector_capacity" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
+  result = ((std::vector< std::pair< double,double > > const *)arg1)->capacity();
+  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_delete_PairDoubleVector(PyObject *self, PyObject *args) {
+  PyObject *resultobj = 0;
+  std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  
+  (void)self;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, SWIG_POINTER_DISOWN |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PairDoubleVector" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
+  delete arg1;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *PairDoubleVector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  PyObject *obj = NULL;
+  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, SWIG_NewClientData(obj));
+  return SWIG_Py_Void();
+}
+
+SWIGINTERN PyObject *PairDoubleVector_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  return SWIG_Python_InitShadowInstance(args);
+}
+
+SWIGINTERN PyObject *_wrap_new_RunDecPair__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
+  PyObject *resultobj = 0;
+  std::pair< double,double > *result = 0 ;
+  
+  (void)self;
+  if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
+  result = (std::pair< double,double > *)new std::pair< double,double >();
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_RunDecPair__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
+  PyObject *resultobj = 0;
+  double arg1 ;
+  double arg2 ;
+  double val1 ;
+  int ecode1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  std::pair< double,double > *result = 0 ;
+  
+  (void)self;
+  if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
+  ecode1 = SWIG_AsVal_double(swig_obj[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "new_RunDecPair" "', argument " "1"" of type '" "double""'");
+  } 
+  arg1 = static_cast< double >(val1);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "new_RunDecPair" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = static_cast< double >(val2);
+  result = (std::pair< double,double > *)new std::pair< double,double >(arg1,arg2);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_NEW |  0 );
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_RunDecPair__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
+  PyObject *resultobj = 0;
+  std::pair< double,double > *arg1 = 0 ;
+  int res1 = SWIG_OLDOBJ ;
+  std::pair< double,double > *result = 0 ;
+  
+  (void)self;
+  if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
+  {
+    std::pair< double,double > *ptr = (std::pair< double,double > *)0;
+    res1 = swig::asptr(swig_obj[0], &ptr);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_RunDecPair" "', argument " "1"" of type '" "std::pair< double,double > const &""'"); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "new_RunDecPair" "', argument " "1"" of type '" "std::pair< double,double > const &""'"); 
+    }
+    arg1 = ptr;
+  }
+  result = (std::pair< double,double > *)new std::pair< double,double >((std::pair< double,double > const &)*arg1);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_NEW |  0 );
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return resultobj;
+fail:
+  if (SWIG_IsNewObj(res1)) delete arg1;
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_new_RunDecPair(PyObject *self, PyObject *args) {
+  Py_ssize_t argc;
+  PyObject *argv[3] = {
+    0
+  };
+  
+  if (!(argc = SWIG_Python_UnpackTuple(args, "new_RunDecPair", 0, 2, argv))) SWIG_fail;
+  --argc;
+  if (argc == 0) {
+    return _wrap_new_RunDecPair__SWIG_0(self, argc, argv);
+  }
+  if (argc == 1) {
+    int _v = 0;
+    int res = swig::asptr(argv[0], (std::pair< double,double >**)(0));
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_new_RunDecPair__SWIG_2(self, argc, argv);
+    }
+  }
+  if (argc == 2) {
+    int _v = 0;
+    {
+      int res = SWIG_AsVal_double(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_new_RunDecPair__SWIG_1(self, argc, argv);
+      }
+    }
+  }
+  
+fail:
+  SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_RunDecPair'.\n"
+    "  Possible C/C++ prototypes are:\n"
+    "    std::pair< double,double >::pair()\n"
+    "    std::pair< double,double >::pair(double,double)\n"
+    "    std::pair< double,double >::pair(std::pair< double,double > const &)\n");
+  return 0;
+}
+
+
+SWIGINTERN PyObject *_wrap_RunDecPair_first_set(PyObject *self, PyObject *args) {
+  PyObject *resultobj = 0;
+  std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
+  double arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  PyObject *swig_obj[2] ;
+  
+  (void)self;
+  if (!SWIG_Python_UnpackTuple(args, "RunDecPair_first_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RunDecPair_first_set" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RunDecPair_first_set" "', argument " "2"" of type '" "double""'");
+  } 
+  arg2 = static_cast< double >(val2);
+  if (arg1) (arg1)->first = arg2;
+  resultobj = SWIG_Py_Void();
+  return resultobj;
+fail:
+  return NULL;
+}
+
+
+SWIGINTERN PyObject *_wrap_RunDecPair_first_get(PyObject *self, PyObject *args) {
+  PyObject *resultobj = 0;
+  std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  PyObject *swig_obj[1] ;
+  double result;
+  
+  (void)self;
+  if (!args) SWIG_fail;
+  swig_obj[0] = args;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RunDecPair_first_get" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
+  }
+  arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
+  result = (double) ((arg1)->first);
+  resultobj = SWIG_From_double(static_cast< double >(result));
+  return resultobj;
+fail:
+  return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_PairDoubleVector_reserve(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_RunDecPair_second_set(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
-  std::vector< std::pair< double,double > >::size_type arg2 ;
+  std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
+  double arg2 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  size_t val2 ;
+  double val2 ;
   int ecode2 = 0 ;
   PyObject *swig_obj[2] ;
   
   (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "PairDoubleVector_reserve", 2, 2, swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, 0 |  0 );
+  if (!SWIG_Python_UnpackTuple(args, "RunDecPair_second_set", 2, 2, swig_obj)) SWIG_fail;
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDoubleVector_reserve" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RunDecPair_second_set" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
+  arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
+  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "PairDoubleVector_reserve" "', argument " "2"" of type '" "std::vector< std::pair< double,double > >::size_type""'");
+    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RunDecPair_second_set" "', argument " "2"" of type '" "double""'");
   } 
-  arg2 = static_cast< std::vector< std::pair< double,double > >::size_type >(val2);
-  (arg1)->reserve(SWIG_STD_MOVE(arg2));
+  arg2 = static_cast< double >(val2);
+  if (arg1) (arg1)->second = arg2;
   resultobj = SWIG_Py_Void();
   return resultobj;
 fail:
@@ -8265,33 +8184,33 @@ SWIGINTERN PyObject *_wrap_PairDoubleVector_reserve(PyObject *self, PyObject *ar
 }
 
 
-SWIGINTERN PyObject *_wrap_PairDoubleVector_capacity(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_RunDecPair_second_get(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
+  std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
-  std::vector< std::pair< double,double > >::size_type result;
+  double result;
   
   (void)self;
   if (!args) SWIG_fail;
   swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, 0 |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "PairDoubleVector_capacity" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > const *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RunDecPair_second_get" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
-  result = ((std::vector< std::pair< double,double > > const *)arg1)->capacity();
-  resultobj = SWIG_From_size_t(static_cast< size_t >(result));
+  arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
+  result = (double) ((arg1)->second);
+  resultobj = SWIG_From_double(static_cast< double >(result));
   return resultobj;
 fail:
   return NULL;
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_PairDoubleVector(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_delete_RunDecPair(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  std::vector< std::pair< double,double > > *arg1 = (std::vector< std::pair< double,double > > *) 0 ;
+  std::pair< double,double > *arg1 = (std::pair< double,double > *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
@@ -8299,11 +8218,11 @@ SWIGINTERN PyObject *_wrap_delete_PairDoubleVector(PyObject *self, PyObject *arg
   (void)self;
   if (!args) SWIG_fail;
   swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, SWIG_POINTER_DISOWN |  0 );
+  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_std__pairT_double_double_t, SWIG_POINTER_DISOWN |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_PairDoubleVector" "', argument " "1"" of type '" "std::vector< std::pair< double,double > > *""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RunDecPair" "', argument " "1"" of type '" "std::pair< double,double > *""'"); 
   }
-  arg1 = reinterpret_cast< std::vector< std::pair< double,double > > * >(argp1);
+  arg1 = reinterpret_cast< std::pair< double,double > * >(argp1);
   delete arg1;
   resultobj = SWIG_Py_Void();
   return resultobj;
@@ -8312,14 +8231,14 @@ SWIGINTERN PyObject *_wrap_delete_PairDoubleVector(PyObject *self, PyObject *arg
 }
 
 
-SWIGINTERN PyObject *PairDoubleVector_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *RunDecPair_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   PyObject *obj = NULL;
   if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_t, SWIG_NewClientData(obj));
+  SWIG_TypeNewClientData(SWIGTYPE_p_std__pairT_double_double_t, SWIG_NewClientData(obj));
   return SWIG_Py_Void();
 }
 
-SWIGINTERN PyObject *PairDoubleVector_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *RunDecPair_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
   return SWIG_Python_InitShadowInstance(args);
 }
 
@@ -8593,8 +8512,6 @@ SWIGINTERN PyObject *_wrap_RunDecPairArray___setitem__(PyObject *self, PyObject
   int res1 = 0 ;
   size_t val2 ;
   int ecode2 = 0 ;
-  void *argp3 ;
-  int res3 = 0 ;
   PyObject *swig_obj[3] ;
   
   (void)self;
@@ -8610,17 +8527,15 @@ SWIGINTERN PyObject *_wrap_RunDecPairArray___setitem__(PyObject *self, PyObject
   } 
   arg2 = static_cast< size_t >(val2);
   {
-    res3 = SWIG_ConvertPtr(swig_obj[2], &argp3, SWIGTYPE_p_RunDecPair,  0  | 0);
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "RunDecPairArray___setitem__" "', argument " "3"" of type '" "RunDecPair""'"); 
-    }  
-    if (!argp3) {
+    void *argp = 0;
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+    if (!SWIG_IsOK(res)) {
+      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "RunDecPairArray___setitem__" "', argument " "3"" of type '" "RunDecPair""'");
+    }
+    if (!argp) {
       SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "RunDecPairArray___setitem__" "', argument " "3"" of type '" "RunDecPair""'");
-    } else {
-      RunDecPair * temp = reinterpret_cast< RunDecPair * >(argp3);
-      arg3 = *temp;
-      if (SWIG_IsNewObj(res3)) delete temp;
     }
+    arg3 = *reinterpret_cast<std::pair<double,double> *>(argp);
   }
   RunDecPairArray___setitem__(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3));
   resultobj = SWIG_Py_Void();
@@ -9571,162 +9486,6 @@ SWIGINTERN PyObject *TriplenfMmu_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObje
   return SWIG_Python_InitShadowInstance(args);
 }
 
-SWIGINTERN PyObject *_wrap_RunDecPair_first_set(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  RunDecPair *arg1 = (RunDecPair *) 0 ;
-  double arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "RunDecPair_first_set", 2, 2, swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RunDecPair_first_set" "', argument " "1"" of type '" "RunDecPair *""'"); 
-  }
-  arg1 = reinterpret_cast< RunDecPair * >(argp1);
-  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RunDecPair_first_set" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = static_cast< double >(val2);
-  if (arg1) (arg1)->first = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RunDecPair_first_get(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  RunDecPair *arg1 = (RunDecPair *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  double result;
-  
-  (void)self;
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RunDecPair_first_get" "', argument " "1"" of type '" "RunDecPair *""'"); 
-  }
-  arg1 = reinterpret_cast< RunDecPair * >(argp1);
-  result = (double) ((arg1)->first);
-  resultobj = SWIG_From_double(static_cast< double >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RunDecPair_second_set(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  RunDecPair *arg1 = (RunDecPair *) 0 ;
-  double arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  double val2 ;
-  int ecode2 = 0 ;
-  PyObject *swig_obj[2] ;
-  
-  (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "RunDecPair_second_set", 2, 2, swig_obj)) SWIG_fail;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RunDecPair_second_set" "', argument " "1"" of type '" "RunDecPair *""'"); 
-  }
-  arg1 = reinterpret_cast< RunDecPair * >(argp1);
-  ecode2 = SWIG_AsVal_double(swig_obj[1], &val2);
-  if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "RunDecPair_second_set" "', argument " "2"" of type '" "double""'");
-  } 
-  arg2 = static_cast< double >(val2);
-  if (arg1) (arg1)->second = arg2;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_RunDecPair_second_get(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  RunDecPair *arg1 = (RunDecPair *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  double result;
-  
-  (void)self;
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "RunDecPair_second_get" "', argument " "1"" of type '" "RunDecPair *""'"); 
-  }
-  arg1 = reinterpret_cast< RunDecPair * >(argp1);
-  result = (double) ((arg1)->second);
-  resultobj = SWIG_From_double(static_cast< double >(result));
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_RunDecPair(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  RunDecPair *result = 0 ;
-  
-  (void)self;
-  if (!SWIG_Python_UnpackTuple(args, "new_RunDecPair", 0, 0, 0)) SWIG_fail;
-  result = (RunDecPair *)new RunDecPair();
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RunDecPair, SWIG_POINTER_NEW |  0 );
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_RunDecPair(PyObject *self, PyObject *args) {
-  PyObject *resultobj = 0;
-  RunDecPair *arg1 = (RunDecPair *) 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  PyObject *swig_obj[1] ;
-  
-  (void)self;
-  if (!args) SWIG_fail;
-  swig_obj[0] = args;
-  res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_RunDecPair, SWIG_POINTER_DISOWN |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_RunDecPair" "', argument " "1"" of type '" "RunDecPair *""'"); 
-  }
-  arg1 = reinterpret_cast< RunDecPair * >(argp1);
-  delete arg1;
-  resultobj = SWIG_Py_Void();
-  return resultobj;
-fail:
-  return NULL;
-}
-
-
-SWIGINTERN PyObject *RunDecPair_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  PyObject *obj = NULL;
-  if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
-  SWIG_TypeNewClientData(SWIGTYPE_p_RunDecPair, SWIG_NewClientData(obj));
-  return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *RunDecPair_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-  return SWIG_Python_InitShadowInstance(args);
-}
-
 SWIGINTERN PyObject *_wrap_AsmMS_Asexact_set(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   AsmMS *arg1 = (AsmMS *) 0 ;
@@ -9885,7 +9644,7 @@ SWIGINTERN PyObject *AsmMS_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *ar
 
 SWIGINTERN PyObject *_wrap_fSetdydx(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  CRunDec arg1 ;
+  SwigValueWrapper< CRunDec > arg1 ;
   double arg2 ;
   int arg3 ;
   void *argp1 ;
@@ -9932,7 +9691,7 @@ SWIGINTERN PyObject *_wrap_fSetdydx(PyObject *self, PyObject *args) {
 
 SWIGINTERN PyObject *_wrap_fSetdydxa1(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  CRunDec arg1 ;
+  SwigValueWrapper< CRunDec > arg1 ;
   double arg2 ;
   double arg3 ;
   void *argp1 ;
@@ -9979,7 +9738,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxa1(PyObject *self, PyObject *args) {
 
 SWIGINTERN PyObject *_wrap_fSetdydxM1(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  CRunDec arg1 ;
+  SwigValueWrapper< CRunDec > arg1 ;
   double arg2 ;
   double arg3 ;
   void *argp1 ;
@@ -10026,7 +9785,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxM1(PyObject *self, PyObject *args) {
 
 SWIGINTERN PyObject *_wrap_fSetdydxa2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  CRunDec arg1 ;
+  SwigValueWrapper< CRunDec > arg1 ;
   double arg2 ;
   double arg3 ;
   void *argp1 ;
@@ -10073,7 +9832,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxa2(PyObject *self, PyObject *args) {
 
 SWIGINTERN PyObject *_wrap_fSetdydxM2(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  CRunDec arg1 ;
+  SwigValueWrapper< CRunDec > arg1 ;
   double arg2 ;
   double arg3 ;
   void *argp1 ;
@@ -10120,7 +9879,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxM2(PyObject *self, PyObject *args) {
 
 SWIGINTERN PyObject *_wrap_fSetdydxa3(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  CRunDec arg1 ;
+  SwigValueWrapper< CRunDec > arg1 ;
   double arg2 ;
   double arg3 ;
   void *argp1 ;
@@ -10167,7 +9926,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxa3(PyObject *self, PyObject *args) {
 
 SWIGINTERN PyObject *_wrap_fSetdydxM3(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  CRunDec arg1 ;
+  SwigValueWrapper< CRunDec > arg1 ;
   double arg2 ;
   double arg3 ;
   void *argp1 ;
@@ -10214,7 +9973,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxM3(PyObject *self, PyObject *args) {
 
 SWIGINTERN PyObject *_wrap_fSetdydxa4(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  CRunDec arg1 ;
+  SwigValueWrapper< CRunDec > arg1 ;
   double arg2 ;
   double arg3 ;
   void *argp1 ;
@@ -10261,7 +10020,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxa4(PyObject *self, PyObject *args) {
 
 SWIGINTERN PyObject *_wrap_fSetdydxM4(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  CRunDec arg1 ;
+  SwigValueWrapper< CRunDec > arg1 ;
   double arg2 ;
   double arg3 ;
   void *argp1 ;
@@ -10308,7 +10067,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxM4(PyObject *self, PyObject *args) {
 
 SWIGINTERN PyObject *_wrap_fSetdydxa5(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  CRunDec arg1 ;
+  SwigValueWrapper< CRunDec > arg1 ;
   double arg2 ;
   double arg3 ;
   void *argp1 ;
@@ -10355,7 +10114,7 @@ SWIGINTERN PyObject *_wrap_fSetdydxa5(PyObject *self, PyObject *args) {
 
 SWIGINTERN PyObject *_wrap_fSetdydxM5(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
-  CRunDec arg1 ;
+  SwigValueWrapper< CRunDec > arg1 ;
   double arg2 ;
   double arg3 ;
   void *argp1 ;
@@ -10470,7 +10229,7 @@ SWIGINTERN PyObject *_wrap_new_CRunDec(PyObject *self, PyObject *args) {
 SWIGINTERN PyObject *_wrap_CRunDec_mq_set(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
-  RunDecPair *arg2 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg2 = (std::pair< double,double > *) (std::pair< double,double > *)0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   void *argp2 = 0 ;
@@ -10484,17 +10243,17 @@ SWIGINTERN PyObject *_wrap_CRunDec_mq_set(PyObject *self, PyObject *args) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CRunDec_mq_set" "', argument " "1"" of type '" "CRunDec *""'"); 
   }
   arg1 = reinterpret_cast< CRunDec * >(argp1);
-  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_RunDecPair, 0 |  0 );
+  res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
   if (!SWIG_IsOK(res2)) {
-    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CRunDec_mq_set" "', argument " "2"" of type '" "RunDecPair [4]""'"); 
+    SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CRunDec_mq_set" "', argument " "2"" of type '" "std::pair< double,double > [4]""'"); 
   } 
-  arg2 = reinterpret_cast< RunDecPair * >(argp2);
+  arg2 = reinterpret_cast< std::pair< double,double > * >(argp2);
   {
     if (arg2) {
       size_t ii = 0;
-      for (; ii < (size_t)4; ++ii) *(RunDecPair *)&arg1->mq[ii] = *((RunDecPair *)arg2 + ii);
+      for (; ii < (size_t)4; ++ii) *(std::pair< double,double > *)&arg1->mq[ii] = *((std::pair< double,double > *)arg2 + ii);
     } else {
-      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in variable '""mq""' of type '""RunDecPair [4]""'");
+      SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in variable '""mq""' of type '""std::pair< double,double > [4]""'");
     }
   }
   resultobj = SWIG_Py_Void();
@@ -10510,7 +10269,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mq_get(PyObject *self, PyObject *args) {
   void *argp1 = 0 ;
   int res1 = 0 ;
   PyObject *swig_obj[1] ;
-  RunDecPair *result = 0 ;
+  std::pair< double,double > *result = 0 ;
   
   (void)self;
   if (!args) SWIG_fail;
@@ -10520,8 +10279,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mq_get(PyObject *self, PyObject *args) {
     SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CRunDec_mq_get" "', argument " "1"" of type '" "CRunDec *""'"); 
   }
   arg1 = reinterpret_cast< CRunDec * >(argp1);
-  result = (RunDecPair *)(RunDecPair *) ((arg1)->mq);
-  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_RunDecPair, 0 |  0 );
+  result = (std::pair< double,double > *)(std::pair< double,double > *) ((arg1)->mq);
+  resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_std__pairT_double_double_t, 0 |  0 );
   return resultobj;
 fail:
   return NULL;
@@ -11960,7 +11719,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_AlL2AlH(PyObject *self, PyObject *args) {
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
   double arg3 ;
-  TriplenfMmu *arg4 = (TriplenfMmu *) 0 ;
+  TriplenfMmu *arg4 = (TriplenfMmu *) (TriplenfMmu *)0 ;
   double arg5 ;
   int arg6 ;
   void *argp1 = 0 ;
@@ -11997,8 +11756,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_AlL2AlH(PyObject *self, PyObject *args) {
   arg3 = static_cast< double >(val3);
   res4 = SWIG_ConvertPtr(swig_obj[3], &argp4,SWIGTYPE_p_TriplenfMmu, 0 |  0 );
   if (!SWIG_IsOK(res4)) {
-    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CRunDec_AlL2AlH" "', argument " "4"" of type '" "TriplenfMmu *""'"); 
-  }
+    SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "CRunDec_AlL2AlH" "', argument " "4"" of type '" "TriplenfMmu []""'"); 
+  } 
   arg4 = reinterpret_cast< TriplenfMmu * >(argp4);
   ecode5 = SWIG_AsVal_double(swig_obj[4], &val5);
   if (!SWIG_IsOK(ecode5)) {
@@ -12227,7 +11986,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -12237,8 +11996,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -12263,11 +12021,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mOS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mOS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mOS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mOS" "', argument " "4"" of type '" "double""'");
@@ -12305,7 +12077,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -12314,8 +12086,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_1(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -12338,11 +12109,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mOS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mOS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mOS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mOS" "', argument " "4"" of type '" "double""'");
@@ -12375,7 +12160,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -12385,8 +12170,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -12411,11 +12195,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mMS" "', argument " "4"" of type '" "double""'");
@@ -12453,7 +12251,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -12462,8 +12260,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_1(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -12486,11 +12283,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mMS" "', argument " "4"" of type '" "double""'");
@@ -12747,7 +12558,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   int arg5 ;
   int arg6 ;
@@ -12756,8 +12567,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   int val5 ;
@@ -12780,11 +12590,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mSI" "', argument " "4"" of type '" "double""'");
@@ -12817,7 +12641,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   int arg5 ;
   int arg6 ;
@@ -12825,8 +12649,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_1(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   int val5 ;
@@ -12847,11 +12670,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mSI" "', argument " "4"" of type '" "double""'");
@@ -12879,7 +12716,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSrun__SWIG_0(PyObject *self, Py_ssize_t
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -12888,8 +12725,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSrun__SWIG_0(PyObject *self, Py_ssize_t
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -12912,11 +12748,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSrun__SWIG_0(PyObject *self, Py_ssize_t
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mMSrun" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mMSrun" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mMSrun" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mMSrun" "', argument " "4"" of type '" "double""'");
@@ -12949,7 +12799,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOSrun__SWIG_0(PyObject *self, Py_ssize_t
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -12958,8 +12808,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOSrun__SWIG_0(PyObject *self, Py_ssize_t
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -12982,11 +12831,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOSrun__SWIG_0(PyObject *self, Py_ssize_t
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mOSrun" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mOSrun" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mOSrun" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mOSrun" "', argument " "4"" of type '" "double""'");
@@ -13073,7 +12936,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSit__SWIG_0(PyObject *self, Py_ssize_t
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -13082,8 +12945,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSit__SWIG_0(PyObject *self, Py_ssize_t
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -13106,11 +12968,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSit__SWIG_0(PyObject *self, Py_ssize_t
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mMSit" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mMSit" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mMSit" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mMSit" "', argument " "4"" of type '" "double""'");
@@ -13197,7 +13073,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mPS(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -13207,8 +13083,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mPS(PyObject *self, PyObject *args) {
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -13234,11 +13109,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mPS(PyObject *self, PyObject *args) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mPS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mPS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mPS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mPS" "', argument " "4"" of type '" "double""'");
@@ -13276,7 +13165,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mPS__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -13287,8 +13176,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mPS__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -13315,11 +13203,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mPS__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mPS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mPS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mPS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mPS" "', argument " "4"" of type '" "double""'");
@@ -13362,7 +13264,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mPS__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -13372,8 +13274,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mPS__SWIG_1(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -13398,11 +13299,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mPS__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mPS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mPS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mPS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mPS" "', argument " "4"" of type '" "double""'");
@@ -13455,9 +13370,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mPS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -13505,9 +13429,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mPS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -13554,8 +13487,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mPS(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mMS2mPS'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mMS2mPS(double,RunDecPair [],double,double,double,int,int,double)\n"
-    "    CRunDec::mMS2mPS(double,RunDecPair [],double,double,double,int,int)\n");
+    "    CRunDec::mMS2mPS(double,std::pair< double,double > *,double,double,double,int,int,double)\n"
+    "    CRunDec::mMS2mPS(double,std::pair< double,double > *,double,double,double,int,int)\n");
   return 0;
 }
 
@@ -13564,7 +13497,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mMS__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -13575,8 +13508,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mMS__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -13603,11 +13535,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mMS__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mPS2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mPS2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mPS2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mPS2mMS" "', argument " "4"" of type '" "double""'");
@@ -13650,7 +13596,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mMS__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -13660,8 +13606,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mMS__SWIG_1(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -13686,11 +13631,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mMS__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mPS2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mPS2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mPS2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mPS2mMS" "', argument " "4"" of type '" "double""'");
@@ -13743,9 +13702,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -13793,9 +13761,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -13842,8 +13819,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mMS(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mPS2mMS'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mPS2mMS(double,RunDecPair [],double,double,double,int,int,double)\n"
-    "    CRunDec::mPS2mMS(double,RunDecPair [],double,double,double,int,int)\n");
+    "    CRunDec::mPS2mMS(double,std::pair< double,double > *,double,double,double,int,int,double)\n"
+    "    CRunDec::mPS2mMS(double,std::pair< double,double > *,double,double,double,int,int)\n");
   return 0;
 }
 
@@ -13852,7 +13829,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mSI__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double (*arg4)(double) = (double (*)(double)) 0 ;
   double arg5 ;
   int arg6 ;
@@ -13862,8 +13839,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mSI__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val5 ;
   int ecode5 = 0 ;
   int val6 ;
@@ -13886,11 +13862,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mSI__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mPS2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mPS2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mPS2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   {
     int res = SWIG_ConvertFunctionPtr(swig_obj[3], (void**)(&arg4), SWIGTYPE_p_f_double__double);
     if (!SWIG_IsOK(res)) {
@@ -13929,7 +13919,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mSI__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double (*arg4)(double) = (double (*)(double)) 0 ;
   double arg5 ;
   int arg6 ;
@@ -13938,8 +13928,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mSI__SWIG_1(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val5 ;
   int ecode5 = 0 ;
   int val6 ;
@@ -13960,11 +13949,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mSI__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mPS2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mPS2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mPS2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   {
     int res = SWIG_ConvertFunctionPtr(swig_obj[3], (void**)(&arg4), SWIGTYPE_p_f_double__double);
     if (!SWIG_IsOK(res)) {
@@ -14013,9 +14016,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           void *ptr = 0;
           int res = SWIG_ConvertFunctionPtr(argv[3], &ptr, SWIGTYPE_p_f_double__double);
@@ -14056,9 +14068,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           void *ptr = 0;
           int res = SWIG_ConvertFunctionPtr(argv[3], &ptr, SWIGTYPE_p_f_double__double);
@@ -14098,8 +14119,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mPS2mSI(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mPS2mSI'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mPS2mSI(double,RunDecPair [],double (*)(double),double,int,int,double)\n"
-    "    CRunDec::mPS2mSI(double,RunDecPair [],double (*)(double),double,int,int)\n");
+    "    CRunDec::mPS2mSI(double,std::pair< double,double > *,double (*)(double),double,int,int,double)\n"
+    "    CRunDec::mPS2mSI(double,std::pair< double,double > *,double (*)(double),double,int,int)\n");
   return 0;
 }
 
@@ -14108,7 +14129,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2m1S(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -14117,8 +14138,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2m1S(PyObject *self, PyObject *args) {
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -14142,11 +14162,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2m1S(PyObject *self, PyObject *args) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2m1S" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2m1S" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2m1S" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2m1S" "', argument " "4"" of type '" "double""'");
@@ -14179,7 +14213,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2m1S__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -14189,8 +14223,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2m1S__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -14215,11 +14248,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2m1S__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2m1S" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2m1S" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2m1S" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2m1S" "', argument " "4"" of type '" "double""'");
@@ -14257,7 +14304,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2m1S__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -14266,8 +14313,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2m1S__SWIG_1(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -14290,11 +14336,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2m1S__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2m1S" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2m1S" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2m1S" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2m1S" "', argument " "4"" of type '" "double""'");
@@ -14342,9 +14402,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2m1S(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -14386,9 +14455,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2m1S(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -14429,8 +14507,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2m1S(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mMS2m1S'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mMS2m1S(double,RunDecPair [],double,double,int,int,double)\n"
-    "    CRunDec::mMS2m1S(double,RunDecPair [],double,double,int,int)\n");
+    "    CRunDec::mMS2m1S(double,std::pair< double,double > *,double,double,int,int,double)\n"
+    "    CRunDec::mMS2m1S(double,std::pair< double,double > *,double,double,int,int)\n");
   return 0;
 }
 
@@ -14439,7 +14517,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mMS__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -14449,8 +14527,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mMS__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -14475,11 +14552,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mMS__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_m1S2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_m1S2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_m1S2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_m1S2mMS" "', argument " "4"" of type '" "double""'");
@@ -14517,7 +14608,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mMS__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -14526,8 +14617,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mMS__SWIG_1(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -14550,11 +14640,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mMS__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_m1S2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_m1S2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_m1S2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_m1S2mMS" "', argument " "4"" of type '" "double""'");
@@ -14602,9 +14706,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -14646,9 +14759,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -14689,8 +14811,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mMS(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_m1S2mMS'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::m1S2mMS(double,RunDecPair [],double,double,int,int,double)\n"
-    "    CRunDec::m1S2mMS(double,RunDecPair [],double,double,int,int)\n");
+    "    CRunDec::m1S2mMS(double,std::pair< double,double > *,double,double,int,int,double)\n"
+    "    CRunDec::m1S2mMS(double,std::pair< double,double > *,double,double,int,int)\n");
   return 0;
 }
 
@@ -14699,7 +14821,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mSI__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double (*arg4)(double) = (double (*)(double)) 0 ;
   int arg5 ;
   int arg6 ;
@@ -14708,8 +14830,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mSI__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   int val5 ;
   int ecode5 = 0 ;
   int val6 ;
@@ -14730,11 +14851,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mSI__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_m1S2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_m1S2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_m1S2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   {
     int res = SWIG_ConvertFunctionPtr(swig_obj[3], (void**)(&arg4), SWIGTYPE_p_f_double__double);
     if (!SWIG_IsOK(res)) {
@@ -14768,7 +14903,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mSI__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double (*arg4)(double) = (double (*)(double)) 0 ;
   int arg5 ;
   int arg6 ;
@@ -14776,8 +14911,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mSI__SWIG_1(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   int val5 ;
   int ecode5 = 0 ;
   int val6 ;
@@ -14796,11 +14930,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mSI__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_m1S2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_m1S2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_m1S2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   {
     int res = SWIG_ConvertFunctionPtr(swig_obj[3], (void**)(&arg4), SWIGTYPE_p_f_double__double);
     if (!SWIG_IsOK(res)) {
@@ -14844,9 +14992,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           void *ptr = 0;
           int res = SWIG_ConvertFunctionPtr(argv[3], &ptr, SWIGTYPE_p_f_double__double);
@@ -14881,9 +15038,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           void *ptr = 0;
           int res = SWIG_ConvertFunctionPtr(argv[3], &ptr, SWIGTYPE_p_f_double__double);
@@ -14917,8 +15083,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_m1S2mSI(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_m1S2mSI'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::m1S2mSI(double,RunDecPair [],double (*)(double),int,int,double)\n"
-    "    CRunDec::m1S2mSI(double,RunDecPair [],double (*)(double),int,int)\n");
+    "    CRunDec::m1S2mSI(double,std::pair< double,double > *,double (*)(double),int,int,double)\n"
+    "    CRunDec::m1S2mSI(double,std::pair< double,double > *,double (*)(double),int,int)\n");
   return 0;
 }
 
@@ -14927,7 +15093,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRS__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -14938,8 +15104,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRS__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -14966,11 +15131,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRS__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mRS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mRS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mRS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mRS" "', argument " "4"" of type '" "double""'");
@@ -15013,7 +15192,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -15025,8 +15204,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -15055,11 +15233,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mRS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mRS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mRS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mRS" "', argument " "4"" of type '" "double""'");
@@ -15107,7 +15299,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -15119,8 +15311,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -15149,11 +15340,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mRS2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mRS2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mRS2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mRS2mMS" "', argument " "4"" of type '" "double""'");
@@ -15201,7 +15406,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI__SWIG_0(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double (*arg4)(double) = (double (*)(double)) 0 ;
   double arg5 ;
   int arg6 ;
@@ -15212,8 +15417,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI__SWIG_0(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val5 ;
   int ecode5 = 0 ;
   int val6 ;
@@ -15238,11 +15442,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI__SWIG_0(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mRS2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mRS2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mRS2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   {
     int res = SWIG_ConvertFunctionPtr(swig_obj[3], (void**)(&arg4), SWIGTYPE_p_f_double__double);
     if (!SWIG_IsOK(res)) {
@@ -15286,7 +15504,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRS__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -15296,8 +15514,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRS__SWIG_1(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -15322,11 +15539,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRS__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mRS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mRS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mRS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mRS" "', argument " "4"" of type '" "double""'");
@@ -15379,9 +15610,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -15429,9 +15669,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -15478,8 +15727,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRS(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mOS2mRS'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mOS2mRS(double,RunDecPair [],double,double,double,int,int,bool)\n"
-    "    CRunDec::mOS2mRS(double,RunDecPair [],double,double,double,int,int)\n");
+    "    CRunDec::mOS2mRS(double,std::pair< double,double > *,double,double,double,int,int,bool)\n"
+    "    CRunDec::mOS2mRS(double,std::pair< double,double > *,double,double,double,int,int)\n");
   return 0;
 }
 
@@ -15488,7 +15737,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -15499,8 +15748,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS__SWIG_1(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -15527,11 +15775,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mRS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mRS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mRS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mRS" "', argument " "4"" of type '" "double""'");
@@ -15574,7 +15836,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS__SWIG_2(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -15584,8 +15846,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS__SWIG_2(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -15610,11 +15871,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS__SWIG_2(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mRS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mRS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mRS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mRS" "', argument " "4"" of type '" "double""'");
@@ -15667,9 +15942,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -15717,9 +16001,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -15773,9 +16066,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -15828,9 +16130,9 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRS(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mMS2mRS'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mMS2mRS(double,RunDecPair [],double,double,double,int,int,double,bool)\n"
-    "    CRunDec::mMS2mRS(double,RunDecPair [],double,double,double,int,int,double)\n"
-    "    CRunDec::mMS2mRS(double,RunDecPair [],double,double,double,int,int)\n");
+    "    CRunDec::mMS2mRS(double,std::pair< double,double > *,double,double,double,int,int,double,bool)\n"
+    "    CRunDec::mMS2mRS(double,std::pair< double,double > *,double,double,double,int,int,double)\n"
+    "    CRunDec::mMS2mRS(double,std::pair< double,double > *,double,double,double,int,int)\n");
   return 0;
 }
 
@@ -15839,7 +16141,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -15850,8 +16152,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS__SWIG_1(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -15878,11 +16179,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mRS2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mRS2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mRS2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mRS2mMS" "', argument " "4"" of type '" "double""'");
@@ -15925,7 +16240,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS__SWIG_2(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -15935,8 +16250,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS__SWIG_2(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -15961,11 +16275,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS__SWIG_2(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mRS2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mRS2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mRS2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mRS2mMS" "', argument " "4"" of type '" "double""'");
@@ -16018,9 +16346,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -16068,9 +16405,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -16124,9 +16470,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -16179,9 +16534,9 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mMS(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mRS2mMS'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mRS2mMS(double,RunDecPair [],double,double,double,int,int,double,bool)\n"
-    "    CRunDec::mRS2mMS(double,RunDecPair [],double,double,double,int,int,double)\n"
-    "    CRunDec::mRS2mMS(double,RunDecPair [],double,double,double,int,int)\n");
+    "    CRunDec::mRS2mMS(double,std::pair< double,double > *,double,double,double,int,int,double,bool)\n"
+    "    CRunDec::mRS2mMS(double,std::pair< double,double > *,double,double,double,int,int,double)\n"
+    "    CRunDec::mRS2mMS(double,std::pair< double,double > *,double,double,double,int,int)\n");
   return 0;
 }
 
@@ -16190,7 +16545,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI__SWIG_1(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double (*arg4)(double) = (double (*)(double)) 0 ;
   double arg5 ;
   int arg6 ;
@@ -16199,9 +16554,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI__SWIG_1(PyObject *self, Py_ssize_t no
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
-  int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  int ecode2 = 0 ;
+  std::pair< double,double > temp3 ;
   double val5 ;
   int ecode5 = 0 ;
   int val6 ;
@@ -16224,11 +16578,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI__SWIG_1(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mRS2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mRS2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mRS2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   {
     int res = SWIG_ConvertFunctionPtr(swig_obj[3], (void**)(&arg4), SWIGTYPE_p_f_double__double);
     if (!SWIG_IsOK(res)) {
@@ -16267,7 +16635,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI__SWIG_2(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double (*arg4)(double) = (double (*)(double)) 0 ;
   double arg5 ;
   int arg6 ;
@@ -16276,8 +16644,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI__SWIG_2(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val5 ;
   int ecode5 = 0 ;
   int val6 ;
@@ -16298,11 +16665,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI__SWIG_2(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mRS2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mRS2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mRS2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   {
     int res = SWIG_ConvertFunctionPtr(swig_obj[3], (void**)(&arg4), SWIGTYPE_p_f_double__double);
     if (!SWIG_IsOK(res)) {
@@ -16351,9 +16732,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           void *ptr = 0;
           int res = SWIG_ConvertFunctionPtr(argv[3], &ptr, SWIGTYPE_p_f_double__double);
@@ -16394,9 +16784,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           void *ptr = 0;
           int res = SWIG_ConvertFunctionPtr(argv[3], &ptr, SWIGTYPE_p_f_double__double);
@@ -16443,9 +16842,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           void *ptr = 0;
           int res = SWIG_ConvertFunctionPtr(argv[3], &ptr, SWIGTYPE_p_f_double__double);
@@ -16491,9 +16899,9 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRS2mSI(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mRS2mSI'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mRS2mSI(double,RunDecPair [],double (*)(double),double,int,int,double,bool)\n"
-    "    CRunDec::mRS2mSI(double,RunDecPair [],double (*)(double),double,int,int,double)\n"
-    "    CRunDec::mRS2mSI(double,RunDecPair [],double (*)(double),double,int,int)\n");
+    "    CRunDec::mRS2mSI(double,std::pair< double,double > *,double (*)(double),double,int,int,double,bool)\n"
+    "    CRunDec::mRS2mSI(double,std::pair< double,double > *,double (*)(double),double,int,int,double)\n"
+    "    CRunDec::mRS2mSI(double,std::pair< double,double > *,double (*)(double),double,int,int)\n");
   return 0;
 }
 
@@ -16502,7 +16910,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRSp(PyObject *self, PyObject *args) {
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -16512,8 +16920,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRSp(PyObject *self, PyObject *args) {
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -16539,11 +16946,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mRSp(PyObject *self, PyObject *args) {
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mRSp" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mRSp" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mRSp" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mRSp" "', argument " "4"" of type '" "double""'");
@@ -16581,7 +17002,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRSp__SWIG_0(PyObject *self, Py_ssize_t n
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -16592,8 +17013,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRSp__SWIG_0(PyObject *self, Py_ssize_t n
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -16620,11 +17040,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRSp__SWIG_0(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mRSp" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mRSp" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mRSp" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mRSp" "', argument " "4"" of type '" "double""'");
@@ -16667,7 +17101,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRSp__SWIG_1(PyObject *self, Py_ssize_t n
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -16677,8 +17111,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRSp__SWIG_1(PyObject *self, Py_ssize_t n
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -16703,11 +17136,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRSp__SWIG_1(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mRSp" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mRSp" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mRSp" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mRSp" "', argument " "4"" of type '" "double""'");
@@ -16760,9 +17207,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRSp(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -16810,9 +17266,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRSp(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -16859,8 +17324,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mRSp(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mMS2mRSp'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mMS2mRSp(double,RunDecPair [],double,double,double,int,int,double)\n"
-    "    CRunDec::mMS2mRSp(double,RunDecPair [],double,double,double,int,int)\n");
+    "    CRunDec::mMS2mRSp(double,std::pair< double,double > *,double,double,double,int,int,double)\n"
+    "    CRunDec::mMS2mRSp(double,std::pair< double,double > *,double,double,double,int,int)\n");
   return 0;
 }
 
@@ -16869,7 +17334,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mMS__SWIG_0(PyObject *self, Py_ssize_t n
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -16880,8 +17345,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mMS__SWIG_0(PyObject *self, Py_ssize_t n
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -16908,11 +17372,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mMS__SWIG_0(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mRSp2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mRSp2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mRSp2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mRSp2mMS" "', argument " "4"" of type '" "double""'");
@@ -16955,7 +17433,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mMS__SWIG_1(PyObject *self, Py_ssize_t n
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
@@ -16965,8 +17443,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mMS__SWIG_1(PyObject *self, Py_ssize_t n
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -16991,11 +17468,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mMS__SWIG_1(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mRSp2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mRSp2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mRSp2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mRSp2mMS" "', argument " "4"" of type '" "double""'");
@@ -17048,9 +17539,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -17098,9 +17598,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -17147,8 +17656,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mMS(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mRSp2mMS'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mRSp2mMS(double,RunDecPair [],double,double,double,int,int,double)\n"
-    "    CRunDec::mRSp2mMS(double,RunDecPair [],double,double,double,int,int)\n");
+    "    CRunDec::mRSp2mMS(double,std::pair< double,double > *,double,double,double,int,int,double)\n"
+    "    CRunDec::mRSp2mMS(double,std::pair< double,double > *,double,double,double,int,int)\n");
   return 0;
 }
 
@@ -17157,7 +17666,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mSI__SWIG_0(PyObject *self, Py_ssize_t n
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double (*arg4)(double) = (double (*)(double)) 0 ;
   double arg5 ;
   int arg6 ;
@@ -17167,8 +17676,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mSI__SWIG_0(PyObject *self, Py_ssize_t n
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val5 ;
   int ecode5 = 0 ;
   int val6 ;
@@ -17191,11 +17699,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mSI__SWIG_0(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mRSp2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mRSp2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mRSp2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   {
     int res = SWIG_ConvertFunctionPtr(swig_obj[3], (void**)(&arg4), SWIGTYPE_p_f_double__double);
     if (!SWIG_IsOK(res)) {
@@ -17234,7 +17756,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mSI__SWIG_1(PyObject *self, Py_ssize_t n
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double (*arg4)(double) = (double (*)(double)) 0 ;
   double arg5 ;
   int arg6 ;
@@ -17243,8 +17765,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mSI__SWIG_1(PyObject *self, Py_ssize_t n
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val5 ;
   int ecode5 = 0 ;
   int val6 ;
@@ -17265,11 +17786,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mSI__SWIG_1(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mRSp2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mRSp2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mRSp2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   {
     int res = SWIG_ConvertFunctionPtr(swig_obj[3], (void**)(&arg4), SWIGTYPE_p_f_double__double);
     if (!SWIG_IsOK(res)) {
@@ -17318,9 +17853,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           void *ptr = 0;
           int res = SWIG_ConvertFunctionPtr(argv[3], &ptr, SWIGTYPE_p_f_double__double);
@@ -17361,9 +17905,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           void *ptr = 0;
           int res = SWIG_ConvertFunctionPtr(argv[3], &ptr, SWIGTYPE_p_f_double__double);
@@ -17403,8 +17956,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mRSp2mSI(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mRSp2mSI'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mRSp2mSI(double,RunDecPair [],double (*)(double),double,int,int,double)\n"
-    "    CRunDec::mRSp2mSI(double,RunDecPair [],double (*)(double),double,int,int)\n");
+    "    CRunDec::mRSp2mSI(double,std::pair< double,double > *,double (*)(double),double,int,int,double)\n"
+    "    CRunDec::mRSp2mSI(double,std::pair< double,double > *,double (*)(double),double,int,int)\n");
   return 0;
 }
 
@@ -17413,20 +17966,19 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN__SWIG_0(PyObject *self, Py_ssize_t n
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
   int arg7 ;
   int arg8 ;
   int arg9 ;
-  int arg10 ;
+  std::string arg10 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -17439,8 +17991,6 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN__SWIG_0(PyObject *self, Py_ssize_t n
   int ecode8 = 0 ;
   int val9 ;
   int ecode9 = 0 ;
-  int val10 ;
-  int ecode10 = 0 ;
   double result;
   
   (void)self;
@@ -17455,11 +18005,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN__SWIG_0(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mKIN" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mKIN" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mKIN" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mKIN" "', argument " "4"" of type '" "double""'");
@@ -17490,12 +18054,16 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN__SWIG_0(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "CRunDec_mMS2mKIN" "', argument " "9"" of type '" "int""'");
   } 
   arg9 = static_cast< int >(val9);
-  ecode10 = SWIG_AsVal_int(swig_obj[9], &val10);
-  if (!SWIG_IsOK(ecode10)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "CRunDec_mMS2mKIN" "', argument " "10"" of type '" "int""'");
-  } 
-  arg10 = static_cast< int >(val10);
-  result = (double)(arg1)->mMS2mKIN(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(swig_obj[9], &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "CRunDec_mMS2mKIN" "', argument " "10"" of type '" "std::string""'"); 
+    }
+    arg10 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  result = (double)(arg1)->mMS2mKIN(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,SWIG_STD_MOVE(arg10));
   resultobj = SWIG_From_double(static_cast< double >(result));
   return resultobj;
 fail:
@@ -17507,20 +18075,19 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS__SWIG_0(PyObject *self, Py_ssize_t n
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
   int arg7 ;
   int arg8 ;
   int arg9 ;
-  int arg10 ;
+  std::string arg10 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -17533,8 +18100,6 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS__SWIG_0(PyObject *self, Py_ssize_t n
   int ecode8 = 0 ;
   int val9 ;
   int ecode9 = 0 ;
-  int val10 ;
-  int ecode10 = 0 ;
   double result;
   
   (void)self;
@@ -17549,11 +18114,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS__SWIG_0(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mKIN2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mKIN2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mKIN2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mKIN2mMS" "', argument " "4"" of type '" "double""'");
@@ -17584,12 +18163,16 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS__SWIG_0(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode9), "in method '" "CRunDec_mKIN2mMS" "', argument " "9"" of type '" "int""'");
   } 
   arg9 = static_cast< int >(val9);
-  ecode10 = SWIG_AsVal_int(swig_obj[9], &val10);
-  if (!SWIG_IsOK(ecode10)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode10), "in method '" "CRunDec_mKIN2mMS" "', argument " "10"" of type '" "int""'");
-  } 
-  arg10 = static_cast< int >(val10);
-  result = (double)(arg1)->mKIN2mMS(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,arg10);
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(swig_obj[9], &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "CRunDec_mKIN2mMS" "', argument " "10"" of type '" "std::string""'"); 
+    }
+    arg10 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  result = (double)(arg1)->mKIN2mMS(arg2,arg3,arg4,arg5,arg6,arg7,arg8,arg9,SWIG_STD_MOVE(arg10));
   resultobj = SWIG_From_double(static_cast< double >(result));
   return resultobj;
 fail:
@@ -20273,7 +20856,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_2(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -20282,8 +20865,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_2(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -20306,11 +20888,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_2(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mOS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mOS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mOS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mOS" "', argument " "4"" of type '" "double""'");
@@ -20343,7 +20939,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_3(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -20351,8 +20947,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_3(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -20373,11 +20968,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS__SWIG_3(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mOS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mOS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mOS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mOS" "', argument " "4"" of type '" "double""'");
@@ -20420,9 +21029,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -20458,9 +21076,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -20502,9 +21129,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -20546,9 +21182,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -20589,10 +21234,10 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOS(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mMS2mOS'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mMS2mOS(double,RunDecPair [],double,double,int,int,double)\n"
-    "    CRunDec::mMS2mOS(double,RunDecPair [],double,double,int,int)\n"
-    "    CRunDec::mMS2mOS(double,RunDecPair [],double,double,int,double)\n"
-    "    CRunDec::mMS2mOS(double,RunDecPair [],double,double,int)\n");
+    "    CRunDec::mMS2mOS(double,std::pair< double,double > *,double,double,int,int,double)\n"
+    "    CRunDec::mMS2mOS(double,std::pair< double,double > *,double,double,int,int)\n"
+    "    CRunDec::mMS2mOS(double,std::pair< double,double > *,double,double,int,double)\n"
+    "    CRunDec::mMS2mOS(double,std::pair< double,double > *,double,double,int)\n");
   return 0;
 }
 
@@ -20601,7 +21246,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_2(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -20610,8 +21255,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_2(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -20634,11 +21278,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_2(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mMS" "', argument " "4"" of type '" "double""'");
@@ -20671,7 +21329,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_3(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -20679,8 +21337,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_3(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -20701,11 +21358,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS__SWIG_3(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mMS" "', argument " "4"" of type '" "double""'");
@@ -20748,9 +21419,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -20786,9 +21466,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -20830,9 +21519,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -20874,9 +21572,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -20917,10 +21624,10 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMS(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mOS2mMS'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mOS2mMS(double,RunDecPair [],double,double,int,int,double)\n"
-    "    CRunDec::mOS2mMS(double,RunDecPair [],double,double,int,int)\n"
-    "    CRunDec::mOS2mMS(double,RunDecPair [],double,double,int,double)\n"
-    "    CRunDec::mOS2mMS(double,RunDecPair [],double,double,int)\n");
+    "    CRunDec::mOS2mMS(double,std::pair< double,double > *,double,double,int,int,double)\n"
+    "    CRunDec::mOS2mMS(double,std::pair< double,double > *,double,double,int,int)\n"
+    "    CRunDec::mOS2mMS(double,std::pair< double,double > *,double,double,int,double)\n"
+    "    CRunDec::mOS2mMS(double,std::pair< double,double > *,double,double,int)\n");
   return 0;
 }
 
@@ -21445,7 +22152,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_2(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   int arg5 ;
   double arg6 ;
@@ -21453,8 +22160,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_2(PyObject *self, Py_ssize_t no
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   int val5 ;
@@ -21475,11 +22181,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_2(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mSI" "', argument " "4"" of type '" "double""'");
@@ -21507,15 +22227,14 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_3(PyObject *self, Py_ssize_t no
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   int arg5 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   int val5 ;
@@ -21534,11 +22253,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI__SWIG_3(PyObject *self, Py_ssize_t no
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mSI" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mSI" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mSI" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mSI" "', argument " "4"" of type '" "double""'");
@@ -21576,9 +22309,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -21608,9 +22350,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -21646,9 +22397,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -21684,9 +22444,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -21721,10 +22490,10 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mSI(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mOS2mSI'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mOS2mSI(double,RunDecPair [],double,int,int,double)\n"
-    "    CRunDec::mOS2mSI(double,RunDecPair [],double,int,int)\n"
-    "    CRunDec::mOS2mSI(double,RunDecPair [],double,int,double)\n"
-    "    CRunDec::mOS2mSI(double,RunDecPair [],double,int)\n");
+    "    CRunDec::mOS2mSI(double,std::pair< double,double > *,double,int,int,double)\n"
+    "    CRunDec::mOS2mSI(double,std::pair< double,double > *,double,int,int)\n"
+    "    CRunDec::mOS2mSI(double,std::pair< double,double > *,double,int,double)\n"
+    "    CRunDec::mOS2mSI(double,std::pair< double,double > *,double,int)\n");
   return 0;
 }
 
@@ -21733,7 +22502,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSrun__SWIG_1(PyObject *self, Py_ssize_t
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -21741,8 +22510,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSrun__SWIG_1(PyObject *self, Py_ssize_t
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -21763,11 +22531,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSrun__SWIG_1(PyObject *self, Py_ssize_t
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mMSrun" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mMSrun" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mMSrun" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mMSrun" "', argument " "4"" of type '" "double""'");
@@ -21810,9 +22592,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSrun(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -21848,9 +22639,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSrun(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -21885,8 +22685,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSrun(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mOS2mMSrun'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mOS2mMSrun(double,RunDecPair [],double,double,int,int)\n"
-    "    CRunDec::mOS2mMSrun(double,RunDecPair [],double,double,int)\n");
+    "    CRunDec::mOS2mMSrun(double,std::pair< double,double > *,double,double,int,int)\n"
+    "    CRunDec::mOS2mMSrun(double,std::pair< double,double > *,double,double,int)\n");
   return 0;
 }
 
@@ -21895,7 +22695,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOSrun__SWIG_1(PyObject *self, Py_ssize_t
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -21903,8 +22703,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOSrun__SWIG_1(PyObject *self, Py_ssize_t
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -21925,11 +22724,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOSrun__SWIG_1(PyObject *self, Py_ssize_t
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mOSrun" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mOSrun" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mOSrun" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mOSrun" "', argument " "4"" of type '" "double""'");
@@ -21972,9 +22785,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOSrun(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -22010,9 +22832,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOSrun(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -22047,8 +22878,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mOSrun(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mMS2mOSrun'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mMS2mOSrun(double,RunDecPair [],double,double,int,int)\n"
-    "    CRunDec::mMS2mOSrun(double,RunDecPair [],double,double,int)\n");
+    "    CRunDec::mMS2mOSrun(double,std::pair< double,double > *,double,double,int,int)\n"
+    "    CRunDec::mMS2mOSrun(double,std::pair< double,double > *,double,double,int)\n");
   return 0;
 }
 
@@ -22181,7 +23012,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSit__SWIG_1(PyObject *self, Py_ssize_t
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   int arg6 ;
@@ -22189,8 +23020,7 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSit__SWIG_1(PyObject *self, Py_ssize_t
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -22211,11 +23041,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSit__SWIG_1(PyObject *self, Py_ssize_t
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mOS2mMSit" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mOS2mMSit" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mOS2mMSit" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mOS2mMSit" "', argument " "4"" of type '" "double""'");
@@ -22258,9 +23102,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSit(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -22296,9 +23149,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSit(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -22333,8 +23195,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mOS2mMSit(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mOS2mMSit'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mOS2mMSit(double,RunDecPair [],double,double,int,int)\n"
-    "    CRunDec::mOS2mMSit(double,RunDecPair [],double,double,int)\n");
+    "    CRunDec::mOS2mMSit(double,std::pair< double,double > *,double,double,int,int)\n"
+    "    CRunDec::mOS2mMSit(double,std::pair< double,double > *,double,double,int)\n");
   return 0;
 }
 
@@ -22467,18 +23329,17 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN__SWIG_1(PyObject *self, Py_ssize_t n
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
   int arg7 ;
-  int arg8 ;
+  std::string arg8 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -22487,8 +23348,6 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN__SWIG_1(PyObject *self, Py_ssize_t n
   int ecode6 = 0 ;
   int val7 ;
   int ecode7 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
   double result;
   
   (void)self;
@@ -22503,11 +23362,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN__SWIG_1(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mMS2mKIN" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mMS2mKIN" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mMS2mKIN" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mMS2mKIN" "', argument " "4"" of type '" "double""'");
@@ -22528,12 +23401,16 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN__SWIG_1(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "CRunDec_mMS2mKIN" "', argument " "7"" of type '" "int""'");
   } 
   arg7 = static_cast< int >(val7);
-  ecode8 = SWIG_AsVal_int(swig_obj[7], &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CRunDec_mMS2mKIN" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = static_cast< int >(val8);
-  result = (double)(arg1)->mMS2mKIN(arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(swig_obj[7], &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "CRunDec_mMS2mKIN" "', argument " "8"" of type '" "std::string""'"); 
+    }
+    arg8 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  result = (double)(arg1)->mMS2mKIN(arg2,arg3,arg4,arg5,arg6,arg7,SWIG_STD_MOVE(arg8));
   resultobj = SWIG_From_double(static_cast< double >(result));
   return resultobj;
 fail:
@@ -22560,9 +23437,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -22584,10 +23470,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN(PyObject *self, PyObject *args) {
                   _v = SWIG_CheckState(res);
                 }
                 if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
+                  int res = SWIG_AsPtr_std_string(argv[7], (std::string**)(0));
+                  _v = SWIG_CheckState(res);
                   if (_v) {
                     return _wrap_CRunDec_mMS2mKIN__SWIG_1(self, argc, argv);
                   }
@@ -22610,9 +23494,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -22644,10 +23537,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN(PyObject *self, PyObject *args) {
                       _v = SWIG_CheckState(res);
                     }
                     if (_v) {
-                      {
-                        int res = SWIG_AsVal_int(argv[9], NULL);
-                        _v = SWIG_CheckState(res);
-                      }
+                      int res = SWIG_AsPtr_std_string(argv[9], (std::string**)(0));
+                      _v = SWIG_CheckState(res);
                       if (_v) {
                         return _wrap_CRunDec_mMS2mKIN__SWIG_0(self, argc, argv);
                       }
@@ -22665,8 +23556,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mMS2mKIN(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mMS2mKIN'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mMS2mKIN(double,RunDecPair [],double,double,double,int,int,int,int)\n"
-    "    CRunDec::mMS2mKIN(double,RunDecPair [],double,double,double,int,int)\n");
+    "    CRunDec::mMS2mKIN(double,std::pair< double,double > *,double,double,double,int,int,int,std::string)\n"
+    "    CRunDec::mMS2mKIN(double,std::pair< double,double > *,double,double,double,int,std::string)\n");
   return 0;
 }
 
@@ -22675,18 +23566,17 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS__SWIG_1(PyObject *self, Py_ssize_t n
   PyObject *resultobj = 0;
   CRunDec *arg1 = (CRunDec *) 0 ;
   double arg2 ;
-  RunDecPair *arg3 = (RunDecPair *) (RunDecPair *)0 ;
+  std::pair< double,double > *arg3 = (std::pair< double,double > *) 0 ;
   double arg4 ;
   double arg5 ;
   double arg6 ;
   int arg7 ;
-  int arg8 ;
+  std::string arg8 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   double val2 ;
   int ecode2 = 0 ;
-  void *argp3 = 0 ;
-  int res3 = 0 ;
+  std::pair< double,double > temp3 ;
   double val4 ;
   int ecode4 = 0 ;
   double val5 ;
@@ -22695,8 +23585,6 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS__SWIG_1(PyObject *self, Py_ssize_t n
   int ecode6 = 0 ;
   int val7 ;
   int ecode7 = 0 ;
-  int val8 ;
-  int ecode8 = 0 ;
   double result;
   
   (void)self;
@@ -22711,11 +23599,25 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS__SWIG_1(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "CRunDec_mKIN2mMS" "', argument " "2"" of type '" "double""'");
   } 
   arg2 = static_cast< double >(val2);
-  res3 = SWIG_ConvertPtr(swig_obj[2], &argp3,SWIGTYPE_p_RunDecPair, 0 |  0 );
-  if (!SWIG_IsOK(res3)) {
-    SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "CRunDec_mKIN2mMS" "', argument " "3"" of type '" "RunDecPair []""'"); 
-  } 
-  arg3 = reinterpret_cast< RunDecPair * >(argp3);
+  {
+    void *argp = 0;
+    // Try RunDecPairArray first
+    int res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a RunDecPairArray, use it directly
+      arg3 = reinterpret_cast<std::pair<double,double> *>(argp);
+    } else {
+      // Try single std::pair<double,double> (RunDecPair)
+      res = SWIG_ConvertPtr(swig_obj[2], &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+      if (SWIG_IsOK(res)) {
+        // It's a single RunDecPair, store in temp3 and pass its address
+        temp3 = *reinterpret_cast<std::pair<double,double> *>(argp);
+        arg3 = &temp3;
+      } else {
+        SWIG_exception_fail(SWIG_ArgError(res), "in method '" "CRunDec_mKIN2mMS" "', argument " "3"" of type '" "std::pair< double,double > *""'");
+      }
+    }
+  }
   ecode4 = SWIG_AsVal_double(swig_obj[3], &val4);
   if (!SWIG_IsOK(ecode4)) {
     SWIG_exception_fail(SWIG_ArgError(ecode4), "in method '" "CRunDec_mKIN2mMS" "', argument " "4"" of type '" "double""'");
@@ -22736,12 +23638,16 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS__SWIG_1(PyObject *self, Py_ssize_t n
     SWIG_exception_fail(SWIG_ArgError(ecode7), "in method '" "CRunDec_mKIN2mMS" "', argument " "7"" of type '" "int""'");
   } 
   arg7 = static_cast< int >(val7);
-  ecode8 = SWIG_AsVal_int(swig_obj[7], &val8);
-  if (!SWIG_IsOK(ecode8)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode8), "in method '" "CRunDec_mKIN2mMS" "', argument " "8"" of type '" "int""'");
-  } 
-  arg8 = static_cast< int >(val8);
-  result = (double)(arg1)->mKIN2mMS(arg2,arg3,arg4,arg5,arg6,arg7,arg8);
+  {
+    std::string *ptr = (std::string *)0;
+    int res = SWIG_AsPtr_std_string(swig_obj[7], &ptr);
+    if (!SWIG_IsOK(res) || !ptr) {
+      SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "CRunDec_mKIN2mMS" "', argument " "8"" of type '" "std::string""'"); 
+    }
+    arg8 = *ptr;
+    if (SWIG_IsNewObj(res)) delete ptr;
+  }
+  result = (double)(arg1)->mKIN2mMS(arg2,arg3,arg4,arg5,arg6,arg7,SWIG_STD_MOVE(arg8));
   resultobj = SWIG_From_double(static_cast< double >(result));
   return resultobj;
 fail:
@@ -22768,9 +23674,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -22792,10 +23707,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS(PyObject *self, PyObject *args) {
                   _v = SWIG_CheckState(res);
                 }
                 if (_v) {
-                  {
-                    int res = SWIG_AsVal_int(argv[7], NULL);
-                    _v = SWIG_CheckState(res);
-                  }
+                  int res = SWIG_AsPtr_std_string(argv[7], (std::string**)(0));
+                  _v = SWIG_CheckState(res);
                   if (_v) {
                     return _wrap_CRunDec_mKIN2mMS__SWIG_1(self, argc, argv);
                   }
@@ -22818,9 +23731,18 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS(PyObject *self, PyObject *args) {
         _v = SWIG_CheckState(res);
       }
       if (_v) {
-        void *vptr = 0;
-        int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPair, 0);
-        _v = SWIG_CheckState(res);
+        {
+          void *vptr = 0;
+          // Check if it's a RunDecPairArray
+          int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+          if (SWIG_IsOK(res)) {
+            _v = 1;
+          } else {
+            // Check if it's a single RunDecPair (std::pair<double,double>)
+            res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+            _v = SWIG_IsOK(res) ? 1 : 0;
+          }
+        }
         if (_v) {
           {
             int res = SWIG_AsVal_double(argv[3], NULL);
@@ -22852,10 +23774,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS(PyObject *self, PyObject *args) {
                       _v = SWIG_CheckState(res);
                     }
                     if (_v) {
-                      {
-                        int res = SWIG_AsVal_int(argv[9], NULL);
-                        _v = SWIG_CheckState(res);
-                      }
+                      int res = SWIG_AsPtr_std_string(argv[9], (std::string**)(0));
+                      _v = SWIG_CheckState(res);
                       if (_v) {
                         return _wrap_CRunDec_mKIN2mMS__SWIG_0(self, argc, argv);
                       }
@@ -22873,8 +23793,8 @@ SWIGINTERN PyObject *_wrap_CRunDec_mKIN2mMS(PyObject *self, PyObject *args) {
 fail:
   SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CRunDec_mKIN2mMS'.\n"
     "  Possible C/C++ prototypes are:\n"
-    "    CRunDec::mKIN2mMS(double,RunDecPair [],double,double,double,int,int,int,int)\n"
-    "    CRunDec::mKIN2mMS(double,RunDecPair [],double,double,double,int,int)\n");
+    "    CRunDec::mKIN2mMS(double,std::pair< double,double > *,double,double,double,int,int,int,std::string)\n"
+    "    CRunDec::mKIN2mMS(double,std::pair< double,double > *,double,double,double,int,std::string)\n");
   return 0;
 }
 
@@ -22932,14 +23852,6 @@ static PyMethodDef SwigMethods[] = {
 	 { "SwigPyIterator___add__", _wrap_SwigPyIterator___add__, METH_VARARGS, NULL},
 	 { "SwigPyIterator___sub__", _wrap_SwigPyIterator___sub__, METH_VARARGS, NULL},
 	 { "SwigPyIterator_swigregister", SwigPyIterator_swigregister, METH_O, NULL},
-	 { "new_PairDouble", _wrap_new_PairDouble, METH_VARARGS, NULL},
-	 { "PairDouble_first_set", _wrap_PairDouble_first_set, METH_VARARGS, NULL},
-	 { "PairDouble_first_get", _wrap_PairDouble_first_get, METH_O, NULL},
-	 { "PairDouble_second_set", _wrap_PairDouble_second_set, METH_VARARGS, NULL},
-	 { "PairDouble_second_get", _wrap_PairDouble_second_get, METH_O, NULL},
-	 { "delete_PairDouble", _wrap_delete_PairDouble, METH_O, NULL},
-	 { "PairDouble_swigregister", PairDouble_swigregister, METH_O, NULL},
-	 { "PairDouble_swiginit", PairDouble_swiginit, METH_VARARGS, NULL},
 	 { "PairDoubleVector_iterator", _wrap_PairDoubleVector_iterator, METH_O, NULL},
 	 { "PairDoubleVector___nonzero__", _wrap_PairDoubleVector___nonzero__, METH_O, NULL},
 	 { "PairDoubleVector___bool__", _wrap_PairDoubleVector___bool__, METH_O, NULL},
@@ -22975,6 +23887,14 @@ static PyMethodDef SwigMethods[] = {
 	 { "delete_PairDoubleVector", _wrap_delete_PairDoubleVector, METH_O, NULL},
 	 { "PairDoubleVector_swigregister", PairDoubleVector_swigregister, METH_O, NULL},
 	 { "PairDoubleVector_swiginit", PairDoubleVector_swiginit, METH_VARARGS, NULL},
+	 { "new_RunDecPair", _wrap_new_RunDecPair, METH_VARARGS, NULL},
+	 { "RunDecPair_first_set", _wrap_RunDecPair_first_set, METH_VARARGS, NULL},
+	 { "RunDecPair_first_get", _wrap_RunDecPair_first_get, METH_O, NULL},
+	 { "RunDecPair_second_set", _wrap_RunDecPair_second_set, METH_VARARGS, NULL},
+	 { "RunDecPair_second_get", _wrap_RunDecPair_second_get, METH_O, NULL},
+	 { "delete_RunDecPair", _wrap_delete_RunDecPair, METH_O, NULL},
+	 { "RunDecPair_swigregister", RunDecPair_swigregister, METH_O, NULL},
+	 { "RunDecPair_swiginit", RunDecPair_swiginit, METH_VARARGS, NULL},
 	 { "new_TriplenfMmuArray", _wrap_new_TriplenfMmuArray, METH_O, NULL},
 	 { "delete_TriplenfMmuArray", _wrap_delete_TriplenfMmuArray, METH_O, NULL},
 	 { "TriplenfMmuArray___getitem__", _wrap_TriplenfMmuArray___getitem__, METH_VARARGS, NULL},
@@ -23027,14 +23947,6 @@ static PyMethodDef SwigMethods[] = {
 	 { "delete_TriplenfMmu", _wrap_delete_TriplenfMmu, METH_O, NULL},
 	 { "TriplenfMmu_swigregister", TriplenfMmu_swigregister, METH_O, NULL},
 	 { "TriplenfMmu_swiginit", TriplenfMmu_swiginit, METH_VARARGS, NULL},
-	 { "RunDecPair_first_set", _wrap_RunDecPair_first_set, METH_VARARGS, NULL},
-	 { "RunDecPair_first_get", _wrap_RunDecPair_first_get, METH_O, NULL},
-	 { "RunDecPair_second_set", _wrap_RunDecPair_second_set, METH_VARARGS, NULL},
-	 { "RunDecPair_second_get", _wrap_RunDecPair_second_get, METH_O, NULL},
-	 { "new_RunDecPair", _wrap_new_RunDecPair, METH_NOARGS, NULL},
-	 { "delete_RunDecPair", _wrap_delete_RunDecPair, METH_O, NULL},
-	 { "RunDecPair_swigregister", RunDecPair_swigregister, METH_O, NULL},
-	 { "RunDecPair_swiginit", RunDecPair_swiginit, METH_VARARGS, NULL},
 	 { "AsmMS_Asexact_set", _wrap_AsmMS_Asexact_set, METH_VARARGS, NULL},
 	 { "AsmMS_Asexact_get", _wrap_AsmMS_Asexact_get, METH_O, NULL},
 	 { "AsmMS_mMSexact_set", _wrap_AsmMS_mMSexact_set, METH_VARARGS, NULL},
@@ -23126,12 +24038,12 @@ static PyMethodDef SwigMethods[] = {
 
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
-static void *_p_RunDecPairArrayTo_p_RunDecPair(void *x, int *SWIGUNUSEDPARM(newmemory)) {
-    return (void *)((RunDecPair *)  ((RunDecPairArray *) x));
-}
 static void *_p_TriplenfMmuArrayTo_p_TriplenfMmu(void *x, int *SWIGUNUSEDPARM(newmemory)) {
     return (void *)((TriplenfMmu *)  ((TriplenfMmuArray *) x));
 }
+static void *_p_RunDecPairArrayTo_p_RunDecPair(void *x, int *SWIGUNUSEDPARM(newmemory)) {
+    return (void *)((RunDecPair *)  ((RunDecPairArray *) x));
+}
 static swig_type_info _swigt__p_AsmMS = {"_p_AsmMS", "AsmMS *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_CRunDec = {"_p_CRunDec", "CRunDec *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_RunDecPair = {"_p_RunDecPair", "RunDecPair *", 0, 0, (void*)0, 0};
@@ -23149,7 +24061,7 @@ static swig_type_info _swigt__p_second_type = {"_p_second_type", "second_type *"
 static swig_type_info _swigt__p_size_type = {"_p_size_type", "size_type *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_std__allocatorT_std__pairT_double_double_t_t = {"_p_std__allocatorT_std__pairT_double_double_t_t", "std::vector< std::pair< double,double > >::allocator_type *|std::allocator< std::pair< double,double > > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_std__invalid_argument = {"_p_std__invalid_argument", "std::invalid_argument *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_std__pairT_double_double_t = {"_p_std__pairT_double_double_t", "std::pair< double,double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__pairT_double_double_t = {"_p_std__pairT_double_double_t", "std::vector< std::pair< double,double > >::value_type *|std::pair< double,double > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_std__vectorT_std__pairT_double_double_t_t = {"_p_std__vectorT_std__pairT_double_double_t_t", "std::vector< std::pair< double,double >,std::allocator< std::pair< double,double > > > *|std::vector< std::pair< double,double > > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_swig__SwigPyIterator = {"_p_swig__SwigPyIterator", "swig::SwigPyIterator *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0, 0, (void*)0, 0};
diff --git a/rundec.i b/rundec.i
index bb3b886..d804e99 100644
--- a/rundec.i
+++ b/rundec.i
@@ -8,18 +8,75 @@
 #include <stdlib.h>
 #include <utility>
 
-#include "CRunDec3/CRunDec.3.1.h"
+#include "CRunDec3/CRunDec.h"
+
+// Define RunDecPair as typedef for compatibility
+typedef std::pair<double,double> RunDecPair;
 %}
 
+%include "std_string.i"
 %include "std_pair.i"
 %include "std_vector.i"
 %include carrays.i
 
 namespace std {
-    %template(PairDouble)          pair<double,double>;
     %template(PairDoubleVector)    vector<pair<double,double> >;
 }
 
+// Create RunDecPair from std::pair<double,double>
+%template(RunDecPair) std::pair<double,double>;
+
 %array_class(TriplenfMmu, TriplenfMmuArray)
+
+// Make the array accept std::pair<double,double> (which is what RunDecPair creates)
+// by telling SWIG that std::pair<double,double> can be used as RunDecPair
+%typemap(in) RunDecPair {
+  void *argp = 0;
+  int res = SWIG_ConvertPtr($input, &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+  if (!SWIG_IsOK(res)) {
+    SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "$1_type""'");
+  }
+  if (!argp) {
+    SWIG_exception_fail(SWIG_NullReferenceError, "invalid null reference " "in method '" "$symname" "', argument " "$argnum"" of type '" "$1_type""'");
+  }
+  $1 = *reinterpret_cast<std::pair<double,double> *>(argp);
+}
+
+// Handle RunDecPair* (pointer) arguments - accept either RunDecPairArray or a single RunDecPair
+%typemap(in) std::pair<double,double>* (std::pair<double,double> temp) {
+  void *argp = 0;
+  // Try RunDecPairArray first
+  int res = SWIG_ConvertPtr($input, &argp, SWIGTYPE_p_RunDecPairArray, 0 | 0);
+  if (SWIG_IsOK(res)) {
+    // It's a RunDecPairArray, use it directly
+    $1 = reinterpret_cast<std::pair<double,double> *>(argp);
+  } else {
+    // Try single std::pair<double,double> (RunDecPair)
+    res = SWIG_ConvertPtr($input, &argp, SWIGTYPE_p_std__pairT_double_double_t, 0 | 0);
+    if (SWIG_IsOK(res)) {
+      // It's a single RunDecPair, store in temp and pass its address
+      temp = *reinterpret_cast<std::pair<double,double> *>(argp);
+      $1 = &temp;
+    } else {
+      SWIG_exception_fail(SWIG_ArgError(res), "in method '" "$symname" "', argument " "$argnum"" of type '" "$1_type""'");
+    }
+  }
+}
+
+// Typecheck typemap for overload resolution - accept either RunDecPairArray or single RunDecPair
+%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER) std::pair<double,double>* {
+  void *vptr = 0;
+  // Check if it's a RunDecPairArray
+  int res = SWIG_ConvertPtr($input, &vptr, SWIGTYPE_p_RunDecPairArray, 0);
+  if (SWIG_IsOK(res)) {
+    $1 = 1;
+  } else {
+    // Check if it's a single RunDecPair (std::pair<double,double>)
+    res = SWIG_ConvertPtr($input, &vptr, SWIGTYPE_p_std__pairT_double_double_t, 0);
+    $1 = SWIG_IsOK(res) ? 1 : 0;
+  }
+}
+
 %array_class(RunDecPair, RunDecPairArray)
-%include "CRunDec3/CRunDec.3.1.h"
+
+%include "CRunDec3/CRunDec.h"
diff --git a/rundec.py b/rundec.py
index 5a69430..476157b 100644
--- a/rundec.py
+++ b/rundec.py
@@ -118,32 +118,6 @@ def __iter__(self):
 
 # Register SwigPyIterator in _rundec:
 _rundec.SwigPyIterator_swigregister(SwigPyIterator)
-class PairDouble(object):
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
-    __repr__ = _swig_repr
-
-    def __init__(self, *args):
-        _rundec.PairDouble_swiginit(self, _rundec.new_PairDouble(*args))
-    first = property(_rundec.PairDouble_first_get, _rundec.PairDouble_first_set)
-    second = property(_rundec.PairDouble_second_get, _rundec.PairDouble_second_set)
-    def __len__(self):
-        return 2
-    def __repr__(self):
-        return str((self.first, self.second))
-    def __getitem__(self, index): 
-        if not (index % 2):
-            return self.first
-        else:
-            return self.second
-    def __setitem__(self, index, val):
-        if not (index % 2):
-            self.first = val
-        else:
-            self.second = val
-    __swig_destroy__ = _rundec.delete_PairDouble
-
-# Register PairDouble in _rundec:
-_rundec.PairDouble_swigregister(PairDouble)
 class PairDoubleVector(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -249,6 +223,32 @@ def capacity(self):
 
 # Register PairDoubleVector in _rundec:
 _rundec.PairDoubleVector_swigregister(PairDoubleVector)
+class RunDecPair(object):
+    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
+    __repr__ = _swig_repr
+
+    def __init__(self, *args):
+        _rundec.RunDecPair_swiginit(self, _rundec.new_RunDecPair(*args))
+    first = property(_rundec.RunDecPair_first_get, _rundec.RunDecPair_first_set)
+    second = property(_rundec.RunDecPair_second_get, _rundec.RunDecPair_second_set)
+    def __len__(self):
+        return 2
+    def __repr__(self):
+        return str((self.first, self.second))
+    def __getitem__(self, index): 
+        if not (index % 2):
+            return self.first
+        else:
+            return self.second
+    def __setitem__(self, index, val):
+        if not (index % 2):
+            self.first = val
+        else:
+            self.second = val
+    __swig_destroy__ = _rundec.delete_RunDecPair
+
+# Register RunDecPair in _rundec:
+_rundec.RunDecPair_swigregister(RunDecPair)
 class TriplenfMmuArray(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
@@ -331,18 +331,6 @@ def __init__(self):
 _rundec.TriplenfMmu_swigregister(TriplenfMmu)
 cvar = _rundec.cvar
 
-class RunDecPair(object):
-    thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
-    __repr__ = _swig_repr
-    first = property(_rundec.RunDecPair_first_get, _rundec.RunDecPair_first_set)
-    second = property(_rundec.RunDecPair_second_get, _rundec.RunDecPair_second_set)
-
-    def __init__(self):
-        _rundec.RunDecPair_swiginit(self, _rundec.new_RunDecPair())
-    __swig_destroy__ = _rundec.delete_RunDecPair
-
-# Register RunDecPair in _rundec:
-_rundec.RunDecPair_swigregister(RunDecPair)
 class AsmMS(object):
     thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
     __repr__ = _swig_repr
diff --git a/setup.py b/setup.py
index 619ae26..6f0fd72 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,8 @@
 from setuptools import setup, Extension
 
 ext_mod = Extension("_rundec",
-                    sources=["_rundec.cc", "CRunDec3/CRunDec.3.1.cpp"],
+                    sources=["_rundec.cc", "CRunDec3/CRunDec.cpp"],
+                    include_dirs=["CRunDec3"],
                     define_macros=[('Py_LIMITED_API', '0x030A0000')],
                     py_limited_api=True,
                     )
diff --git a/test/test_massMS.py b/test/test_massMS.py
index a6f6bea..c643438 100644
--- a/test/test_massMS.py
+++ b/test/test_massMS.py
@@ -106,19 +106,19 @@ def test_mThr2mMS(self):
       #convert PS mass to MS mass
       mcPS = 1.153
       scale_mpPS = 2.0
-      self.assertAlmostEqual(crd.mPS2mMS(mcPS,None,as3,3.0,scale_mpPS,3,4),0.9862692441,delta=1e-5)
+      self.assertAlmostEqual(crd.mPS2mMS(mcPS,None,as3,3.0,scale_mpPS,3,4),0.9862692441,delta=3e-5)
      
       #convert 1S mass to MS mass
       mc1S = 1.5145
-      self.assertAlmostEqual(crd.m1S2mMS(mc1S,None,as3,3.0,3,4),0.9575677386,delta=1e-5)
+      self.assertAlmostEqual(crd.m1S2mMS(mc1S,None,as3,3.0,3,4),0.9575677386,delta=3e-5)
 
       #convert RS mass to MS mass
       mcRS = 1.043
-      self.assertAlmostEqual(crd.mRS2mMS(mcRS,None,as3,3.0,2.0,3,4),1.006783427,delta=1e-5)
+      self.assertAlmostEqual(crd.mRS2mMS(mcRS,None,as3,3.0,2.0,3,4),1.006783427,delta=3e-5)
 
       #convert RS' mass to MS mass
       mcRSp = 1.357
-      self.assertAlmostEqual(crd.mRSp2mMS(mcRSp,None,as3,3.0,2.0,3,4),0.9661584143,delta=1e-5)
+      self.assertAlmostEqual(crd.mRSp2mMS(mcRSp,None,as3,3.0,2.0,3,4),0.9661584143,delta=3e-5)
 
     def test_mMS2mThr(self):
       crd = rundec.CRunDec()
@@ -168,17 +168,13 @@ def test_mMS2mkin(self):
       loops = 3
       muWC = 1.0
       #convert MS mass to kinetic mass, scheme A
-      scheme=0
-      self.assertAlmostEqual(crd.mMS2mKIN(mbMS,mcMS,as4,mbMS,muWC,loops,scheme),4.541932121,delta=1e-5)
+      self.assertAlmostEqual(crd.mMS2mKIN(mbMS,mcMS,as4,mbMS,muWC,loops,'A'),4.541932121,delta=1e-5)
       #convert MS mass to kinetic mass, scheme B
-      scheme=1
-      self.assertAlmostEqual(crd.mMS2mKIN(mbMS,mcMS,as4,mbMS,muWC,loops,scheme),4.525651485,delta=1e-5)  
+      self.assertAlmostEqual(crd.mMS2mKIN(mbMS,mcMS,as4,mbMS,muWC,loops,'B'),4.525651485,delta=1e-5)  
       #convert MS mass to kinetic mass, scheme C
-      scheme=2
-      self.assertAlmostEqual(crd.mMS2mKIN(mbMS,mcMS,as4,mbMS,muWC,loops,scheme),4.547027037,delta=1e-5)
+      self.assertAlmostEqual(crd.mMS2mKIN(mbMS,mcMS,as4,mbMS,muWC,loops,'C'),4.547027037,delta=1e-5)
       #convert MS mass to kinetic mass, scheme D
-      scheme=3
-      self.assertAlmostEqual(crd.mMS2mKIN(mbMS,mcMS,as4,mbMS,muWC,loops,scheme),4.543448616,delta=1e-5) 
+      self.assertAlmostEqual(crd.mMS2mKIN(mbMS,mcMS,as4,mbMS,muWC,loops,'D'),4.543448616,delta=1e-5) 
 
     def test_mkin2mMS(self):
       crd = rundec.CRunDec()
@@ -211,20 +207,16 @@ def test_mkin2mMS(self):
       muWC = 1.0
 
       #convert kinetic mass to MS mass, scheme A
-      scheme=0
-      self.assertAlmostEqual(crd.mKIN2mMS(mbkin,mcMS,as3,mbkin,muWC,loops,scheme),4.134409357,delta=1e-5)
+      self.assertAlmostEqual(crd.mKIN2mMS(mbkin,mcMS,as3,mbkin,muWC,loops,'A'),4.134409357,delta=1e-5)
 
       #convert kinetic mass to MS mass, scheme B
-      scheme=1
-      self.assertAlmostEqual(crd.mKIN2mMS(mbkin,mcMS,as4,mbkin,muWC,loops,scheme),4.126363246,delta=1e-5)
+      self.assertAlmostEqual(crd.mKIN2mMS(mbkin,mcMS,as4,mbkin,muWC,loops,'B'),4.126363246,delta=1e-5)
 
       #convert kinetic mass to MS mass, scheme C
-      scheme=2
-      self.assertAlmostEqual(crd.mKIN2mMS(mbkin,mcMS,as4,mbkin,muWC,loops,scheme),4.106094652,delta=1e-5)
+      self.assertAlmostEqual(crd.mKIN2mMS(mbkin,mcMS,as4,mbkin,muWC,loops,'C'),4.106094652,delta=1e-5)
 
       #convert kinetic mass to MS mass, scheme D
-      scheme=3
-      self.assertAlmostEqual(crd.mKIN2mMS(mbkin,mcMS,as3,mbkin,muWC,loops,scheme),4.134150911,delta=1e-5)
+      self.assertAlmostEqual(crd.mKIN2mMS(mbkin,mcMS,as3,mbkin,muWC,loops,'D'),4.134150911,delta=1e-5)
 
 if __name__ == '__main__':
 

From 04a4c7671e5c24ee0ca240caeb89bcdfe97a1922 Mon Sep 17 00:00:00 2001
From: David Straub <straub@protonmail.com>
Date: Wed, 4 Feb 2026 11:07:17 +0100
Subject: [PATCH 2/2] Try to fix Windows build, black formatting

---
 setup.py | 51 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/setup.py b/setup.py
index 6f0fd72..1b279cf 100644
--- a/setup.py
+++ b/setup.py
@@ -1,26 +1,35 @@
 from setuptools import setup, Extension
+import sys
 
-ext_mod = Extension("_rundec",
-                    sources=["_rundec.cc", "CRunDec3/CRunDec.cpp"],
-                    include_dirs=["CRunDec3"],
-                    define_macros=[('Py_LIMITED_API', '0x030A0000')],
-                    py_limited_api=True,
-                    )
+# Windows requires _USE_MATH_DEFINES to get M_PI
+extra_compile_args = []
+if sys.platform == "win32":
+    extra_compile_args = ["/D_USE_MATH_DEFINES"]
 
-setup(name="rundec",
-      version="0.7",
-      author="David M. Straub",
-      author_email="david.straub@hm.edu",
-      url="https://github.com/DavidMStraub/rundec-python",
-      description="A Python wrapper around the CRunDec package for the "
-                  " running and decoupling of the strong coupling constant "
-                  "and quark masses",
-      long_description="""`CRunDec` is a C++ program developed by
+ext_mod = Extension(
+    "_rundec",
+    sources=["_rundec.cc", "CRunDec3/CRunDec.cpp"],
+    include_dirs=["CRunDec3"],
+    define_macros=[("Py_LIMITED_API", "0x030A0000")],
+    extra_compile_args=extra_compile_args,
+    py_limited_api=True,
+)
+
+setup(
+    name="rundec",
+    version="0.7",
+    author="David M. Straub",
+    author_email="david.straub@hm.edu",
+    url="https://github.com/DavidMStraub/rundec-python",
+    description="A Python wrapper around the CRunDec package for the "
+    " running and decoupling of the strong coupling constant "
+    "and quark masses",
+    long_description="""`CRunDec` is a C++ program developed by
       Florian Herren and Matthias Steinhauser. This Python package
       provides a thin wrapper around `CRunDec` generated with SWIG.""",
-      license="MIT",
-      py_modules=['rundec'],
-      ext_modules=[ext_mod],
-      extras_require={'testing': ['pytest']},
-      options={'bdist_wheel': {'py_limited_api': 'cp310'}},
-      )
+    license="MIT",
+    py_modules=["rundec"],
+    ext_modules=[ext_mod],
+    extras_require={"testing": ["pytest"]},
+    options={"bdist_wheel": {"py_limited_api": "cp310"}},
+)