From 19a4a64fd58ef66a6ee3cf4f2a469fba61c60a09 Mon Sep 17 00:00:00 2001 From: Kati Lassila-Perini Date: Thu, 15 Jun 2023 13:05:28 +0200 Subject: [PATCH] Update root version (#7) * Update root version (closes #6) * Update root container Update root container from reanahub/reana-env-root6:6.18.04 to rootproject/root:6.28.00-ubuntu22.04 * Update README.md Add a notion of the version and update the git command (git clone git won't work anymore) --- README.md | 8 ++++---- environment.yml | 2 +- reana.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6925da2..0b37e3b 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,7 @@ Analysis using reduced NanoAOD files created from CMS open data producing a high ![](dimuonSpectrum.png) ## How to run this? - -The analysis needs solely a ROOT installation (6.16 or greater). You can get the software easily using the CMS Open Data VM and CVMFS. Just run the following command in the terminal to source an appropriate software stack: +The analysis needs solely a ROOT installation. You can get the software easily using the CMS Open Data VM and CVMFS. Note that version 6.28.00 is used in the environment.yml and reana.yaml files but it may be different when set up through CVMFS. Just run the following command in the terminal to source an appropriate software stack: ```bash source /cvmfs/sft.cern.ch/lcg/views/LCG_95/x86_64-slc6-gcc8-opt/setup.sh @@ -15,7 +14,8 @@ source /cvmfs/sft.cern.ch/lcg/views/LCG_95/x86_64-slc6-gcc8-opt/setup.sh To download the files, you can either use `git` with the following command or download them directly via the web browser. ```bash -git clone git://github.com/cms-opendata-analyses/DimuonSpectrumNanoAODOutreachAnalysis -b v1.4 +git clone https://github.com/cms-opendata-analyses/DimuonSpectrumNanoAODOutreachAnalysis.git -b v1.5 +cd DimuonSpectrumNanoAODOutreachAnalysis ``` The analysis code itself is provided in Python and C++. The instructions to run the scripts is shown below: @@ -30,7 +30,7 @@ jupyter notebook To run via binder, you just have to click the following link and follow the instructions. You can ignore the two error messages. -[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/cms-opendata-analyses/DimuonSpectrumNanoAODOutreachAnalysis/v1.4) +[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/cms-opendata-analyses/DimuonSpectrumNanoAODOutreachAnalysis/HEAD?labpath=dimuonSpectrum.ipynb) **Python (interactive):** diff --git a/environment.yml b/environment.yml index 0521a84..0fb0ebf 100644 --- a/environment.yml +++ b/environment.yml @@ -2,4 +2,4 @@ name: analysis channels: - conda-forge dependencies: - - root=6.16.00 + - root=6.28.00 diff --git a/reana.yaml b/reana.yaml index 1786fa1..603fe67 100644 --- a/reana.yaml +++ b/reana.yaml @@ -7,11 +7,11 @@ workflow: specification: steps: - name: compile - environment: reanahub/reana-env-root6:6.18.04 + environment: rootproject/root:6.28.00-ubuntu22.04 commands: - g++ -v -O3 -o dimuonSpectrum dimuonSpectrum.C `root-config --cflags --libs` - name: run - environment: reanahub/reana-env-root6:6.18.04 + environment: rootproject/root:6.28.00-ubuntu22.04 commands: - ./dimuonSpectrum outputs: