diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3dff2a7d36574fddb886b8be822312f582cc50a3..019399e629a926114053271c63228a92baaf0b85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,6 +41,8 @@ test_image: - wget -q https://cms-service-dqmdc.web.cern.ch/CAF/certification/Collisions16/13TeV/ReReco/Final/Cert_271036-284044_13TeV_23Sep2016ReReco_Collisions16_JSON.txt - brilcalc lumi -b "STABLE BEAMS" --normtag /cvmfs/cms-bril.cern.ch/cms-lumi-pog/Normtags/normtag_DATACERT.json -i Cert_271036-284044_13TeV_23Sep2016ReReco_Collisions16_JSON.txt -u /fb -c web - brilcalc lumi -b "STABLE BEAMS" --normtag /cvmfs/cms-bril.cern.ch/cms-lumi-pog/Normtags/normtag_DATACERT.json -i Cert_271036-284044_13TeV_23Sep2016ReReco_Collisions16_JSON.txt -u /fb + - brilcalc lumi --hltpath "HLT_ZeroBias_v*" -r 325308 + - brilcalc lumi --xing -i "{325308:[[1,1]]}" -o testbx.out tag_image: stage: tag diff --git a/Dockerfile b/Dockerfile index 928fd89f5afae7e63312f415eec30c3b68fc56e4..d54eaf4bb68ae1b4398a2b0695d4dfa4e4fa2053 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,8 +36,11 @@ RUN python -m pip install --user --upgrade pip && \ sed -i '/import pytz/a from decimal import Decimal' /home/bril/.local/lib/python3.10/site-packages/brilws/cli/brilcalc_main.py && \ # sed -i 's|livefrac = 1.-row\['\''deadtimefrac'\''\]|livefrac = Decimal\(1.\)-row\['\''deadtimefrac'\''\]|' /home/bril/.local/lib/python3.10/site-packages/brilws/cli/brilcalc_main.py sed -i 's|livefrac = 1.-row\['\''deadtimefrac'\''\]|livefrac = 1.-float\(row\['\''deadtimefrac'\''\]\)|' /home/bril/.local/lib/python3.10/site-packages/brilws/cli/brilcalc_main.py && \ + sed -i 's|row\['\''delivered'\''\]\*|float\(row\['\''delivered'\''\]\)\*|' /home/bril/.local/lib/python3.10/site-packages/brilws/cli/brilcalc_main.py && \ + sed -i 's|row\['\''recorded'\''\]\*|float\(row\['\''recorded'\''\]\)\*|' /home/bril/.local/lib/python3.10/site-packages/brilws/cli/brilcalc_main.py && \ sed -i 's|if normtag and normtag is not '\''withoutcorrection'\''|if normtag and normtag != '\''withoutcorrection'\''|' /home/bril/.local/lib/python3.10/site-packages/brilws/cli/brilcalc_main.py && \ sed -i 's|return ncollidingbx\*P\.polyval(ivalue\,coefs)|return ncollidingbx\*P\.polyval(float(ivalue)\,coefs)|' /home/bril/.local/lib/python3.10/site-packages/brilws/corrector.py && \ + sed -i 's|fromstring|frombytes|' /home/bril/.local/lib/python3.10/site-packages/brilws/api.py && \ sed -i 's|collections.Iterable|collections.abc.Iterable|g' /home/bril/.local/lib/python3.10/site-packages/brilws/corrector.py && \ sed -i 's|collections.Iterable|collections.abc.Iterable|g' /home/bril/.local/lib/python3.10/site-packages/brilws/api.py