From 018eec048fc42e5006239cbd78fbad03b170d06d Mon Sep 17 00:00:00 2001 From: Clemens Lange Date: Fri, 2 Sep 2022 14:53:24 +0200 Subject: [PATCH 1/2] Add HLT path and perbunch test commands --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3dff2a7..019399e 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 -- GitLab From 4cb9d2454266566a475c8671f2cfbe52bae6002d Mon Sep 17 00:00:00 2001 From: Clemens Lange Date: Fri, 2 Sep 2022 15:31:27 +0200 Subject: [PATCH 2/2] Patch brilcalc_main.py --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 928fd89..d54eaf4 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 -- GitLab