Skip to content

Commit

Permalink
fix: voms setup, Wc selection
Browse files Browse the repository at this point in the history
wf: fix Wc selection and array_writer
ci: add valid, fix voms
util: add new tagger
env: restrict setup tool & add test_env
  • Loading branch information
Ming-Yan committed Jul 24, 2024
1 parent 1c99c74 commit 2145737
Show file tree
Hide file tree
Showing 14 changed files with 162 additions and 85 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/BTA_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
# base64 -i $HOME/.globus/usercert.pem
chmod 400 $HOME/.globus/userkey.pem
openssl rand -out $HOME/.rnd -hex 256
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --vomses ${X509_VOMSES} --debug --pwstdin
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --debug --pwstdin
chmod 755 /usr/share/miniconda3/envs/btv_coffea/etc/grid-security/certificates
- name: Test xrootd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/QCD_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
# base64 -i $HOME/.globus/usercert.pem
chmod 400 $HOME/.globus/userkey.pem
openssl rand -out $HOME/.rnd -hex 256
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --vomses ${X509_VOMSES} --debug --pwstdin
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --debug --pwstdin
chmod 755 /usr/share/miniconda3/envs/btv_coffea/etc/grid-security/certificates
- name: Test xrootd
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ctag_DY_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ jobs:
# base64 -i $HOME/.globus/usercert.pem
chmod 400 $HOME/.globus/userkey.pem
openssl rand -out $HOME/.rnd -hex 256
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --vomses ${X509_VOMSES} --debug --pwstdin
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --debug --pwstdin
chmod 755 /usr/share/miniconda3/envs/btv_coffea/etc/grid-security/certificates
- name: Test xrootd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ctag_Wc_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
# base64 -i $HOME/.globus/usercert.pem
chmod 400 $HOME/.globus/userkey.pem
openssl rand -out $HOME/.rnd -hex 256
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --vomses ${X509_VOMSES} --debug --pwstdin
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --debug --pwstdin
chmod 755 /usr/share/miniconda3/envs/btv_coffea/etc/grid-security/certificates
- name: Test xrootd
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ctag_ttbar_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
# base64 -i $HOME/.globus/usercert.pem
chmod 400 $HOME/.globus/userkey.pem
openssl rand -out $HOME/.rnd -hex 256
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --vomses ${X509_VOMSES} --debug --pwstdin
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --debug --pwstdin
chmod 755 /usr/share/miniconda3/envs/btv_coffea/etc/grid-security/certificates
- name: Test xrootd
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ttbar_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
# base64 -i $HOME/.globus/usercert.pem
chmod 400 $HOME/.globus/userkey.pem
openssl rand -out $HOME/.rnd -hex 256
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --vomses ${X509_VOMSES} --debug --pwstdin
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --pwstdin
chmod 755 /usr/share/miniconda3/envs/btv_coffea/etc/grid-security/certificates
- name: Test xrootd
run: |
Expand Down
109 changes: 109 additions & 0 deletions .github/workflows/validation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
name: Prompt dataMC Workflows

on:
push:
branches: [ master ]
paths:
- 'src/BTVNanoCommissioning/workflows/validation.py'
- 'src/BTVNanoCommissioning/helpers/update_branch.py'
- 'src/BTVNanoCommissioning/helpers/func.py'
- 'src/BTVNanoCommissioning/helpers/definitions.py'
- 'src/BTVNanoCommissioning/utils/*'
- '.github/workflows/validation.yml'
pull_request_target:
branches: [ master ]
paths:
- 'src/BTVNanoCommissioning/workflows/validation.py'
- 'src/BTVNanoCommissioning/helpers/update_branch.py'
- 'src/BTVNanoCommissioning/helpers/func.py'
- 'src/BTVNanoCommissioning/helpers/definitions.py'
- 'src/BTVNanoCommissioning/utils/*'
- '.github/workflows/validation.yml'
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
strategy:
max-parallel: 4
matrix:
python-version: ["3.10"]

defaults:
run:
shell: "bash -l {0}"

steps:
- uses: actions/checkout@v2
- name: update submodules
env:
SSHKEY: ${{ secrets.GIT_CERN_SSH_PRIVATE }}
run: |
mkdir $HOME/.ssh
echo "$SSHKEY" > $HOME/.ssh/id_rsa
chmod 600 $HOME/.ssh/id_rsa
echo "HOST *" > ~/.ssh/config
echo "StrictHostKeyChecking no" >> ~/.ssh/config
git submodule update --init --recursive
- uses: cvmfs-contrib/github-action-cvmfs@v2
with:
cvmfs_repositories: 'grid.cern.ch'

- name: Set conda environment
uses: conda-incubator/setup-miniconda@v2
with:
python-version: ${{ matrix.python-version }}
miniforge-variant: Mambaforge
channels: conda-forge,defaults
channel-priority: true
activate-environment: btv_coffea
environment-file: test_env.yml
auto-activate-base: false

- name: Verify environment
run: |
conda info
conda env list
conda list
- name: Set up proxy
# https://awesome-workshop.github.io/gitlab-cms/03-vomsproxy/index.html
# continue-on-error: true
env:
# To genereate secrets use (strip all \n)
# base64 -i ~/.globus/usercert.pem | awk NF=NF RS= OFS=
# base64 -i ~/.globus/userkey.pem | awk NF=NF RS= OFS=
# Cross check roundtrip by adding ``| base64 -d `` and see if same as input
GRID_USERKEY: ${{ secrets.GRID_USERKEY }}
GRID_USERCERT: ${{ secrets.GRID_USERCERT }}
# Read automatically by voms-proxy-init
X509_VOMS_DIR: /cvmfs/grid.cern.ch/etc/grid-security/vomsdir/
X509_VOMSES: /cvmfs/grid.cern.ch/etc/grid-security/vomses/
X509_DEFAULT_USER_CERT: $HOME/.globus/usercert.pem
X509_DEFAULT_USER_KEY: $HOME/.globus/userkey.pem
run: |
mkdir $HOME/.globus
printf $GRID_USERKEY | base64 -d > $HOME/.globus/userkey.pem
printf $GRID_USERCERT | base64 -d > $HOME/.globus/usercert.pem
# DEBUG: dump decoded cert, cert is public, but don't dump key!
# base64 -i $HOME/.globus/usercert.pem
chmod 400 $HOME/.globus/userkey.pem
openssl rand -out $HOME/.rnd -hex 256
printf "${{secrets.GRID_PASSWORD}}" | voms-proxy-init --voms cms --debug --pwstdin
chmod 755 /usr/share/miniconda3/envs/btv_coffea/etc/grid-security/certificates
- name: Test xrootd
run: |
xrdcp root://eoscms.cern.ch//eos/cms/store/group/phys_btag/nano-commissioning/test_w_dj.root .
- name: Install Repo
run: |
pip install -e .
- name: btag dileptonic ttbar workflows with correctionlib
run: |
string=$(git log -1 --pretty=format:'%s')
python runner.py --workflow ttdilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative $opts
2 changes: 1 addition & 1 deletion .sites_map.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"T0_CH_CERN_Disk": {"/+store/t0streamer/(.*)": "root://eoscms.cern.ch//eos/cms/store/t0streamer/$1?eos.app=cmst0", "/+store/(.*)": "root://eoscms.cern.ch//eos/cms/tier0/store/$1?eos.app=cmst0"}, "T1_DE_KIT_Disk": "root://cmsxrootd-kit.gridka.de:1094/", "T1_ES_PIC_Disk": "root://xrootd-cmst1-door.pic.es:1094//pnfs/pic.es/data/cms/disk", "T1_FR_CCIN2P3_Disk": "root://ccxrdcms.in2p3.fr:1094/pnfs/in2p3.fr/data/cms/disk/data", "T1_IT_CNAF_Disk": "root://xrootd-cms.infn.it:1194/", "T1_RU_JINR_Disk": "root://xrootd01.jinr-t1.ru:1094//pnfs/jinr-t1.ru/data/cms", "T1_UK_RAL_Disk": "root://rdr.echo.stfc.ac.uk/", "T1_US_FNAL_Disk": "root://cmsdcadisk.fnal.gov//dcache/uscmsdisk/store/", "T2_AT_Vienna": "root://eos.grid.vbc.ac.at:1094//eos/vbc/experiments/cms", "T2_BE_IIHE": "root://maite.iihe.ac.be:1095//", "T2_BR_SPRACE": "root://osg-se.sprace.org.br:1094/", "T2_BR_UERJ": "root://xrootd.hepgrid.uerj.br:1094/", "T2_CH_CERN": "root://eoscms.cern.ch//eos/cms", "T2_CH_CSCS": "root://storage01.lcg.cscs.ch:1096//pnfs/lcg.cscs.ch/cms/trivcat", "T2_CN_Beijing": "root://cceos.ihep.ac.cn:1094//eos/ihep/cms", "T2_DE_DESY": "root://dcache-cms-xrootd.desy.de:1094/", "T2_DE_RWTH": "root://grid-cms-xrootd.physik.rwth-aachen.de:1094/", "T2_EE_Estonia": "root://xrootd.hep.kbfi.ee:1094/", "T2_ES_CIEMAT": "root://gaexrdoor.ciemat.es:1094/", "T2_ES_IFCA": "root://gridftp.ifca.es/", "T2_FI_HIP": "root://hip-cms-se.csc.fi:1094/", "T2_FR_IPHC": "root://sbgdcache.in2p3.fr/", "T2_HU_Budapest": "root://grid143.kfki.hu:1094/", "T2_IT_Pisa" : "root://cms-xrd-global.cern.ch/","T2_IN_TIFR": "root://se01.indiacms.res.in//dpm/indiacms.res.in/home/cms", "T2_IT_Legnaro": "root://t2-xrdcms.lnl.infn.it:7070/", "T2_KR_KISTI": "root://cms-t2-se01.sdfarm.kr:1094/", "T2_PK_NCP": "root://pcncp22.ncp.edu.pk:1094//dpm/ncp.edu.pk/home/cms", "T2_PL_Swierk": "root://se.cis.gov.pl:1094//grid/cms", "T2_PT_NCG_Lisbon": "root://xroot02.ncg.ingrid.pt:1094/", "T2_RU_IHEP": "root://dp0015.m45.ihep.su:1094/", "T2_RU_INR": "root://grse001.inr.troitsk.ru:1094/", "T2_RU_ITEP": "root://se3.itep.ru/", "T2_RU_JINR": "root://lcgsexrd.jinr.ru:1095/", "T2_TR_METU": "root://eymir.grid.metu.edu.tr//dpm/grid.metu.edu.tr/home/cms", "T2_TW_NCHC": "root://se01.grid.nchc.org.tw//cms", "T2_UA_KIPT": "root://cms-se0.kipt.kharkov.ua//dpm/kipt.kharkov.ua/home/cms", "T2_UK_London_Brunel": "root://dc2-grid-64.brunel.ac.uk:11001/", "T2_UK_London_IC": "root://gfe02.grid.hep.ph.ic.ac.uk:1094//pnfs/hep.ph.ic.ac.uk/data/cms", "T2_UK_SGrid_Bristol": "root://xrootd.phy.bris.ac.uk:1094//xrootd/cms", "T2_UK_SGrid_RALPP": "root://mover.pp.rl.ac.uk:1094/pnfs/pp.rl.ac.uk/data/cms", "T2_US_Caltech": "root://xrootd-redir.ultralight.org:1094/", "T2_US_Florida": "root://cmsio2.rc.ufl.edu:1094/", "T2_US_MIT": "root://xrootd.cmsaf.mit.edu:1094/", "T2_US_MIT_Buffer": "root://tapexrd.cmsaf.mit.edu:1094/", "T2_US_Nebraska": "root://xrootd-local.unl.edu:1094/", "T2_US_Purdue": "root://eos.cms.rcac.purdue.edu/", "T2_US_UCSD": "root://redirector.t2.ucsd.edu:1095/", "T2_US_Vanderbilt": "root://xrootd-vanderbilt.sites.opensciencegrid.org:1094/", "T2_US_Wisconsin": "root://cmsxrootd.hep.wisc.edu:1094/", "T3_BG_UNI_SOFIA": "root://se01.grid.uni-sofia.bg:1094//dpm/grid.uni-sofia.bg/home/cms", "T3_BY_NCPHEP": "root://grid05.hep.by//cms", "T3_CH_CERN_OpenData": {"/+store/data/(.*)": "root://eospublic.cern.ch//eos/opendata/cms/$1", "/+store/(.*)": "root://eospublic.cern.ch//eos/opendata/cms/$1"}, "T3_CH_PSI": "root://t3se01.psi.ch:1094/", "T3_FR_IPNL": "root://lyogrid06.in2p3.fr//dpm/in2p3.fr/home/cms/data", "T3_HU_Debrecen": "root://dpm.grid.atomki.hu/", "T3_IN_TIFRCloud": "root://se01.indiacms.res.in//dpm/indiacms.res.in/home/cms", "T3_IN_VBU": "root://storage.vb-ehep.in//dpm/vb-ehep.in/home/cms", "T3_IR_IPM": "root://se1.hep.ipm.ir//data", "T3_IT_Perugia": "root://cream-bdii.pg.infn.it//storage/cms", "T3_IT_Trieste": "root://cmsxrd.ts.infn.it:1094/", "T3_KR_KISTI": "root://cms-xrdr.sdfarm.kr:1094//xrd", "T3_KR_KNU": "root://cluster142.knu.ac.kr:1094/", "T3_KR_UOS": "root://cms.sscc.uos.ac.kr:1094/", "T3_MX_Cinvestav": "root://proton.fis.cinvestav.mx/", "T3_RU_MEPhI": "root://cms.lxfarm.mephi.ru//lustre/cms/phedex", "T3_TW_NCU": "root://ncusmstor1.grid.sinica.edu.tw:1094//eos/cms", "T3_US_Baylor": "root://kodiak-se.baylor.edu:1094/", "T3_US_Brown": "root://pbrux30cit.hep.brown.edu:1094/", "T3_US_Colorado": "root://hepxrd01-colorado.sites.opensciencegrid.org:1094/", "T3_US_FNALLPC": "root://cmseos.fnal.gov//eos/uscms", "T3_US_MIT": "root://submit50.mit.edu:1094/", "T3_US_NotreDame": "root://deepthought.crc.nd.edu/", "T3_US_OSG_SoCal_Cache": "root://xcache.ultralight.org:3040/", "T3_US_PuertoRico": "root://cms-se.hep.uprm.edu/", "T3_US_Rice": "root://bonner04.rice.edu:1094/", "T3_US_Rutgers": "root://ruhex-osgce.rutgers.edu/", "T3_US_UMD": "root://hepcms-se2.umd.edu:1094/", "T3_US_UMiss": "root://umiss005.hep.olemiss.edu:1094//cms/", "T3_US_VC3_NotreDame": "root://deepthought.crc.nd.edu/", "T3_US_CMU": "root://cmsdata.phys.cmu.edu/", "T3_IT_MIB": "root://storm.mib.infn.it:1094/", "T3_CH_CERNBOX": "root://eosuser.cern.ch//eos/user/", "T3_CY_UCY": "root://heptaur2.ucy.ac.cy:1094/", "T2_PL_Cyfronet": "root://se02.grid.cyfronet.pl:11001//dpm/grid.cyfronet.pl/home/cms", "T3_TW_TIDC": "root://tidc-smstor1.grid.sinica.edu.tw:1094//eos/cms"}
{"T0_CH_CERN_Disk": {"/+store/t0streamer/(.*)": "root://eoscms.cern.ch//eos/cms/store/t0streamer/$1?eos.app=cmst0", "/+store/(.*)": "root://eoscms.cern.ch//eos/cms/tier0/store/$1?eos.app=cmst0"}, "T1_DE_KIT_Disk": "root://cmsxrootd-kit.gridka.de:1094/", "T1_ES_PIC_Disk": "root://xrootd-cmst1-door.pic.es:1094//pnfs/pic.es/data/cms/disk", "T1_FR_CCIN2P3_Disk": "root://ccxrdcms.in2p3.fr:1094/pnfs/in2p3.fr/data/cms/disk/data", "T1_IT_CNAF_Disk": "root://xrootd-cms.infn.it:1194/", "T1_RU_JINR_Disk": "root://xrootd01.jinr-t1.ru:1094//pnfs/jinr-t1.ru/data/cms", "T1_UK_RAL_Disk": "root://rdr.echo.stfc.ac.uk/", "T1_US_FNAL_Disk": "root://cmsdcadisk.fnal.gov//dcache/uscmsdisk/", "T2_AT_Vienna": "root://eos.grid.vbc.ac.at:1094//eos/vbc/experiments/cms", "T2_BE_IIHE": "root://maite.iihe.ac.be:1095//", "T2_BR_SPRACE": "root://osg-se.sprace.org.br:1094/", "T2_BR_UERJ": "root://xrootd.hepgrid.uerj.br:1094/", "T2_CH_CERN": "root://eoscms.cern.ch//eos/cms", "T2_CH_CSCS": "root://storage01.lcg.cscs.ch:1096//pnfs/lcg.cscs.ch/cms/trivcat", "T2_CN_Beijing": "root://cceos.ihep.ac.cn:1094//eos/ihep/cms", "T2_DE_DESY": "root://dcache-cms-xrootd.desy.de:1094/", "T2_DE_RWTH": "root://grid-cms-xrootd.physik.rwth-aachen.de:1094/", "T2_EE_Estonia": "root://xrootd.hep.kbfi.ee:1094/", "T2_ES_CIEMAT": "root://gaexrdoor.ciemat.es:1094/", "T2_ES_IFCA": "root://gridftp.ifca.es/", "T2_FI_HIP": "root://hip-cms-se.csc.fi:1094/", "T2_FR_IPHC": "root://sbgdcache.in2p3.fr/", "T2_HU_Budapest": "root://grid143.kfki.hu:1094/", "T2_IT_Pisa" : "root://cms-xrd-global.cern.ch/","T2_IN_TIFR": "root://se01.indiacms.res.in//dpm/indiacms.res.in/home/cms", "T2_IT_Legnaro": "root://t2-xrdcms.lnl.infn.it:7070/", "T2_KR_KISTI": "root://cms-t2-se01.sdfarm.kr:1094/", "T2_PK_NCP": "root://pcncp22.ncp.edu.pk:1094//dpm/ncp.edu.pk/home/cms", "T2_PL_Swierk": "root://se.cis.gov.pl:1094//grid/cms", "T2_PT_NCG_Lisbon": "root://xroot02.ncg.ingrid.pt:1094/", "T2_RU_IHEP": "root://dp0015.m45.ihep.su:1094/", "T2_RU_INR": "root://grse001.inr.troitsk.ru:1094/", "T2_RU_ITEP": "root://se3.itep.ru/", "T2_RU_JINR": "root://lcgsexrd.jinr.ru:1095/", "T2_TR_METU": "root://eymir.grid.metu.edu.tr//dpm/grid.metu.edu.tr/home/cms", "T2_TW_NCHC": "root://se01.grid.nchc.org.tw//cms", "T2_UA_KIPT": "root://cms-se0.kipt.kharkov.ua//dpm/kipt.kharkov.ua/home/cms", "T2_UK_London_Brunel": "root://dc2-grid-64.brunel.ac.uk:11001/", "T2_UK_London_IC": "root://gfe02.grid.hep.ph.ic.ac.uk:1094//pnfs/hep.ph.ic.ac.uk/data/cms", "T2_UK_SGrid_Bristol": "root://xrootd.phy.bris.ac.uk:1094//xrootd/cms", "T2_UK_SGrid_RALPP": "root://mover.pp.rl.ac.uk:1094/pnfs/pp.rl.ac.uk/data/cms", "T2_US_Caltech": "root://xrootd-redir.ultralight.org:1094/", "T2_US_Florida": "root://cmsio2.rc.ufl.edu:1094/", "T2_US_MIT": "root://xrootd.cmsaf.mit.edu:1094/", "T2_US_MIT_Buffer": "root://tapexrd.cmsaf.mit.edu:1094/", "T2_US_Nebraska": "root://xrootd-local.unl.edu:1094/", "T2_US_Purdue": "root://eos.cms.rcac.purdue.edu/", "T2_US_UCSD": "root://redirector.t2.ucsd.edu:1095/", "T2_US_Vanderbilt": "root://xrootd-vanderbilt.sites.opensciencegrid.org:1094/", "T2_US_Wisconsin": "root://cmsxrootd.hep.wisc.edu:1094/", "T3_BG_UNI_SOFIA": "root://se01.grid.uni-sofia.bg:1094//dpm/grid.uni-sofia.bg/home/cms", "T3_BY_NCPHEP": "root://grid05.hep.by//cms", "T3_CH_CERN_OpenData": {"/+store/data/(.*)": "root://eospublic.cern.ch//eos/opendata/cms/$1", "/+store/(.*)": "root://eospublic.cern.ch//eos/opendata/cms/$1"}, "T3_CH_PSI": "root://t3se01.psi.ch:1094/", "T3_FR_IPNL": "root://lyogrid06.in2p3.fr//dpm/in2p3.fr/home/cms/data", "T3_HU_Debrecen": "root://dpm.grid.atomki.hu/", "T3_IN_TIFRCloud": "root://se01.indiacms.res.in//dpm/indiacms.res.in/home/cms", "T3_IN_VBU": "root://storage.vb-ehep.in//dpm/vb-ehep.in/home/cms", "T3_IR_IPM": "root://se1.hep.ipm.ir//data", "T3_IT_Perugia": "root://cream-bdii.pg.infn.it//storage/cms", "T3_IT_Trieste": "root://cmsxrd.ts.infn.it:1094/", "T3_KR_KISTI": "root://cms-xrdr.sdfarm.kr:1094//xrd", "T3_KR_KNU": "root://cluster142.knu.ac.kr:1094/", "T3_KR_UOS": "root://cms.sscc.uos.ac.kr:1094/", "T3_MX_Cinvestav": "root://proton.fis.cinvestav.mx/", "T3_RU_MEPhI": "root://cms.lxfarm.mephi.ru//lustre/cms/phedex", "T3_TW_NCU": "root://ncusmstor1.grid.sinica.edu.tw:1094//eos/cms", "T3_US_Baylor": "root://kodiak-se.baylor.edu:1094/", "T3_US_Brown": "root://pbrux30cit.hep.brown.edu:1094/", "T3_US_Colorado": "root://hepxrd01-colorado.sites.opensciencegrid.org:1094/", "T3_US_FNALLPC": "root://cmseos.fnal.gov//eos/uscms", "T3_US_MIT": "root://submit50.mit.edu:1094/", "T3_US_NotreDame": "root://deepthought.crc.nd.edu/", "T3_US_OSG_SoCal_Cache": "root://xcache.ultralight.org:3040/", "T3_US_PuertoRico": "root://cms-se.hep.uprm.edu/", "T3_US_Rice": "root://bonner04.rice.edu:1094/", "T3_US_Rutgers": "root://ruhex-osgce.rutgers.edu/", "T3_US_UMD": "root://hepcms-se2.umd.edu:1094/", "T3_US_UMiss": "root://umiss005.hep.olemiss.edu:1094//cms/", "T3_US_VC3_NotreDame": "root://deepthought.crc.nd.edu/", "T3_US_CMU": "root://cmsdata.phys.cmu.edu/", "T3_IT_MIB": "root://storm.mib.infn.it:1094/", "T3_CH_CERNBOX": "root://eosuser.cern.ch//eos/user/", "T3_CY_UCY": "root://heptaur2.ucy.ac.cy:1094/", "T2_PL_Cyfronet": "root://se02.grid.cyfronet.pl:11001//dpm/grid.cyfronet.pl/home/cms", "T3_TW_TIDC": "root://tidc-smstor1.grid.sinica.edu.tw:1094//eos/cms"}
4 changes: 4 additions & 0 deletions src/BTVNanoCommissioning/helpers/definitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -6285,13 +6285,17 @@ def axes_name(var):
unit = unit + " RobustParTAK4"
elif "PNet" in var:
unit = unit + " PNet"
elif "UParT" in var:
unit = unit + " UParTAK4"
else:
unit = unit + " DeepCSV"
# output node
if "CvL" in var:
unit = unit + " CvL"
elif "CvB" in var:
unit = unit + " CvB"
elif "CvNotB" in var:
unit = unit + " CvNotB"
elif "B_b" in var or "ProbB" in var:
unit = unit + " Prob(b)"
elif "B_bb" in var:
Expand Down
23 changes: 3 additions & 20 deletions src/BTVNanoCommissioning/utils/histogrammer.py
Original file line number Diff line number Diff line change
Expand Up @@ -473,28 +473,18 @@ def histogrammer(events, workflow):
disc_list = [
"btagDeepFlavB",
"btagDeepFlavC",
"btagTransDeepFlavB",
"btagTransDeepFlavC",
"btagDeepFlavCvL",
"btagDeepFlavCvB",
"btagDeepFlavB_b",
"btagDeepFlavB_bb",
"btagTransDeepFlavB_lepb",
"btagTransDeepFlavB_b",
"btagTransDeepFlavB_bb",
"btagTransDeepFlavB_lepb",
"btagPNetB",
"btagTransPNetB",
"btagPNetCvB",
"btagPNetCvL",
"btagPNetCvNotB",
"btagPNetProbB",
"btagPNetProbC",
"btagPNetProbG",
"btagPNetProbUDS",
"btagTransPNetProbB",
"btagTransPNetProbC",
"btagTransPNetProbG",
"btagTransPNetProbUDS",
"btagPNetQvG",
"btagPNetTauVJet",
"btagRobustParTAK4B",
Expand All @@ -504,13 +494,6 @@ def histogrammer(events, workflow):
"btagRobustParTAK4C",
"btagRobustParTAK4G",
"btagRobustParTAK4UDS",
"btagTransRobustParTAK4B",
"btagTransRobustParTAK4B_b",
"btagTransRobustParTAK4B_bb",
"btagTransRobustParTAK4B_lepb",
"btagTransRobustParTAK4C",
"btagTransRobustParTAK4G",
"btagTransRobustParTAK4UDS",
"btagRobustParTAK4CvB",
"btagRobustParTAK4CvL",
"btagRobustParTAK4QG",
Expand Down Expand Up @@ -633,14 +616,14 @@ def histogrammer(events, workflow):
Hist.axis.Regular(50, 0, 10, name="discr", label=disc),
Hist.storage.Weight(),
)
elif "PNetRegPtRawRes" == disc:
elif "Res" == disc:
_hist_dict[f"{disc}_{i}"] = Hist.Hist(
syst_axis,
flav_axis,
Hist.axis.Regular(40, 0, 1, name="discr", label=disc),
Hist.storage.Weight(),
)
elif "PNetRegPtRawCorr" in disc:
elif "Corr" in disc:
_hist_dict[f"{disc}_{i}"] = Hist.Hist(
syst_axis,
flav_axis,
Expand Down
Loading

0 comments on commit 2145737

Please sign in to comment.