From 6fd1c046dd939feb211d8886165dc3b19acc79bd Mon Sep 17 00:00:00 2001 From: Oleksandr Zenaiev <oleksandr.zenaiev@cern.ch> Date: Sun, 27 Jan 2019 22:53:41 +0000 Subject: [PATCH 1/3] Update install-xfitter (test) --- tools/install-xfitter | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/install-xfitter b/tools/install-xfitter index 8d0479ca7..49b13783d 100755 --- a/tools/install-xfitter +++ b/tools/install-xfitter @@ -412,7 +412,15 @@ else export PATH=$CURRENTDIR/deps/apfel/bin/:$PATH #apfelgrid - lhapdf get NNPDF30_nlo_as_0118 + if [ -d /cvmfs ] + then + lhapdf get NNPDF30_nlo_as_0118 + else + wget wget http://www.hepforge.org/archive/lhapdf/pdfsets/6.2/NNPDF30_nlo_as_0118.tar.gz + tar xvzpf NNPDF30_nlo_as_0118.tar.gz + mv NNPDF30_nlo_as_0118 `lhapdf-config --datadir` + rm NNPDF30_nlo_as_0118.tar.gz + fi echo "Installing APFELgrid $apfelgridver..." # tmp solution is to use fork @zenaiev apfelgridver=1.0.5 -- GitLab From b68ef94f5d359a55148e5358d118090dd88c50e4 Mon Sep 17 00:00:00 2001 From: Oleksandr Zenaiev <oleksandr.zenaiev@cern.ch> Date: Sun, 27 Jan 2019 23:12:57 +0000 Subject: [PATCH 2/3] redirecting output to the install log file and fixed typo --- tools/install-xfitter | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/install-xfitter b/tools/install-xfitter index 49b13783d..1e32e53fd 100755 --- a/tools/install-xfitter +++ b/tools/install-xfitter @@ -414,14 +414,13 @@ else #apfelgrid if [ -d /cvmfs ] then - lhapdf get NNPDF30_nlo_as_0118 + lhapdf get NNPDF30_nlo_as_0118 >> $CURRENTDIR/install.log 2>&1 else - wget wget http://www.hepforge.org/archive/lhapdf/pdfsets/6.2/NNPDF30_nlo_as_0118.tar.gz - tar xvzpf NNPDF30_nlo_as_0118.tar.gz - mv NNPDF30_nlo_as_0118 `lhapdf-config --datadir` - rm NNPDF30_nlo_as_0118.tar.gz + wget http://www.hepforge.org/archive/lhapdf/pdfsets/6.2/NNPDF30_nlo_as_0118.tar.gz >> $CURRENTDIR/install.log 2>&1 + tar xvzpf NNPDF30_nlo_as_0118.tar.gz `lhapdf-config --datadir` >> $CURRENTDIR/install.log 2>&1 + rm NNPDF30_nlo_as_0118.tar.gz >> $CURRENTDIR/install.log 2>&1 fi - echo "Installing APFELgrid $apfelgridver..." + echo "Installing APFELgrid $apfelgridver..." # tmp solution is to use fork @zenaiev apfelgridver=1.0.5 if [[ $http == "curl" ]] -- GitLab From 8f572e0a40b6fb1a8f537295571897af22eae849 Mon Sep 17 00:00:00 2001 From: Oleksandr Zenaiev <oleksandr.zenaiev@cern.ch> Date: Sun, 27 Jan 2019 23:24:25 +0000 Subject: [PATCH 3/3] one more fix --- tools/install-xfitter | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/install-xfitter b/tools/install-xfitter index 1e32e53fd..2f537fb52 100755 --- a/tools/install-xfitter +++ b/tools/install-xfitter @@ -417,7 +417,8 @@ else lhapdf get NNPDF30_nlo_as_0118 >> $CURRENTDIR/install.log 2>&1 else wget http://www.hepforge.org/archive/lhapdf/pdfsets/6.2/NNPDF30_nlo_as_0118.tar.gz >> $CURRENTDIR/install.log 2>&1 - tar xvzpf NNPDF30_nlo_as_0118.tar.gz `lhapdf-config --datadir` >> $CURRENTDIR/install.log 2>&1 + tar xvzpf NNPDF30_nlo_as_0118.tar.gz >> $CURRENTDIR/install.log 2>&1 + mv NNPDF30_nlo_as_0118 `lhapdf-config --datadir` >> $CURRENTDIR/install.log 2>&1 rm NNPDF30_nlo_as_0118.tar.gz >> $CURRENTDIR/install.log 2>&1 fi echo "Installing APFELgrid $apfelgridver..." -- GitLab