diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 019399e629a926114053271c63228a92baaf0b85..500a021b44b2b57dd68e7a1e95949bed01b3f028 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,6 +27,7 @@ test_image: image: name: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA} entrypoint: [""] + allow_failure: true script: - python --version --version - command -v python @@ -43,6 +44,8 @@ test_image: - 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 + - brilcalc lumi -b "STABLE BEAMS" --amodetag PROTPHYS --beamenergy 6500 -u /fb --normtag hfoc16PaperV5 --begin 279656 --end 279656 + - brilcalc lumi -b "STABLE BEAMS" --amodetag PROTPHYS --beamenergy 6500 -u /fb --normtag pcc16PaperV5 --begin 279656 --end 279656 tag_image: stage: tag diff --git a/Dockerfile b/Dockerfile index d54eaf4bb68ae1b4398a2b0695d4dfa4e4fa2053..f23261458aa856cde4c08365ac40e24e3e8431ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,6 +40,7 @@ RUN python -m pip install --user --upgrade pip && \ 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|return ncollidingbx\*P\.polyval2d(bxlumi\,totlumi\,coefs)|return ncollidingbx\*P\.polyval2d(float(bxlumi)\,float(totlumi)\,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