From 3b457159b8509d7563550f0f7204a596944a7522 Mon Sep 17 00:00:00 2001 From: Kati Lassila-Perini Date: Mon, 28 Nov 2022 09:04:10 +0100 Subject: [PATCH 1/5] Use updated poet repo configs --- workflow_test.sh | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/workflow_test.sh b/workflow_test.sh index 6a67e90..707343e 100644 --- a/workflow_test.sh +++ b/workflow_test.sh @@ -1,5 +1,5 @@ # parameters: $1 package, $2 branch, $3 configuration file with path from package root -# $4 GlobalTag $ GitHub organization/owner +# $4 GlobalTag $5 isdata flag $6 GitHub organization/owner sudo chown $USER /mnt/vol #sudo mkdir /cvmfs @@ -23,7 +23,8 @@ if [ -z "$1" ]; then package=TriggerInfoTool; else package=$1; fi if [ -z "$2" ]; then branch=2011; else branch=$2; fi if [ -z "$3" ]; then config=GeneralInfoAnalyzer/python/triggerinfoanalyzer_cfg.py; else config=$3; fi if [ -z "$4" ]; then globaltag=FT_53_LV5_AN1; else globaltag=$4; fi -if [ -z "$5" ]; then gitdir=cms-opendata-analyses; else gitdir=$5; fi +if [ -z "$5" ]; then isdata=False; else isdata=$5; fi +if [ -z "$6" ]; then gitdir=cms-opendata-analyses; else gitdir=$6; fi dbfile="$globaltag".db @@ -57,20 +58,10 @@ cp /mnt/vol/dbline.py . chmod +x dbline.py #curl https://raw.githubusercontent.com/katilp/condition-data-test/main/find_db.sh > find_db.sh -#comment the label that is missing in 2011 data -if [ $branch = 2011 ] -then - sudo sed -i 's/softElectronByPtBJetTags/softPFElectronBJetTags/g' /cvmfs/cms.cern.ch/slc6_amd64_gcc472/cms/cmssw/CMSSW_5_3_32/src/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py - # sudo sed -i '/softElectronByPtBJetTags/d' /cvmfs/cms.cern.ch/slc6_amd64_gcc472/cms/cmssw/CMSSW_5_3_32/src/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py - sudo sed -i '/softElectronByIP3dBJetTags/d' /cvmfs/cms.cern.ch/slc6_amd64_gcc472/cms/cmssw/CMSSW_5_3_32/src/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py - sudo sed -i '/softMuonByPtBJetTags/d' /cvmfs/cms.cern.ch/slc6_amd64_gcc472/cms/cmssw/CMSSW_5_3_32/src/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py - sudo sed -i '/softMuonByIP3dBJetTags/d' /cvmfs/cms.cern.ch/slc6_amd64_gcc472/cms/cmssw/CMSSW_5_3_32/src/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py - sudo sed -i 's/softMuonBJetTags/softPFMuonBJetTags/g' /cvmfs/cms.cern.ch/slc6_amd64_gcc472/cms/cmssw/CMSSW_5_3_32/src/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py -fi # FIXME: make this configurable, if cloning from the original repo's, take a local config with the needed modifications if [ $package = TriggerInfoTool ] && [ $gitdir = cms-opendata-analyses ]; then cp /mnt/vol/trigger_2011_cfg.py $config; fi -if [ $package = PhysObjectExtractorTool ] && [ $gitdir = cms-legacydata-analyses ]; then config=/mnt/vol/jec_cfg.py; fi +# if [ $package = PhysObjectExtractorTool ] && [ $gitdir = cms-legacydata-analyses ]; then config=/mnt/vol/jec_cfg.py; fi ls -l @@ -78,4 +69,4 @@ ls -l # cmsRun $config || echo ignore # cmsRun /mnt/vol/jec_cfg.py || echo ignore -./find_db.sh $package $branch $config $globaltag +./find_db.sh $package $branch $config $globaltag $isdata From 05683a391ceacd572ebf430b1da72007193ca93c Mon Sep 17 00:00:00 2001 From: Kati Lassila-Perini Date: Mon, 28 Nov 2022 09:06:09 +0100 Subject: [PATCH 2/5] Update main.yaml --- .github/workflows/main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index a543163..a547690 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -19,7 +19,7 @@ jobs: mkdir outputs - name: Start CMS OD container run: | - docker run -v $(pwd):/mnt/vol -v /cvmfs:/mountedcvmfs -w /home/cmsusr cmsopendata/cmssw_5_3_32-slc6_amd64_gcc472 /bin/bash /mnt/vol/workflow_test.sh PhysObjectExtractorTool 2011 PhysObjectExtractor/python/poet_cfg_mc_pat.py START53_LV6A1 katilp + docker run -v $(pwd):/mnt/vol -v /cvmfs:/mountedcvmfs -w /home/cmsusr cmsopendata/cmssw_5_3_32-slc6_amd64_gcc472 /bin/bash /mnt/vol/workflow_test.sh PhysObjectExtractorTool 2011 PhysObjectExtractor/python/poet_cfg.py FT_53_LV5_AN1 True #cp -r /mnt/vol/products outputs # upload output file - name: Upload artifact From 143a211b2db90797dae46990438850808157daa6 Mon Sep 17 00:00:00 2001 From: Kati Lassila-Perini Date: Mon, 28 Nov 2022 09:08:11 +0100 Subject: [PATCH 3/5] Update find_db.sh --- find_db.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/find_db.sh b/find_db.sh index 7ea26ac..55f646e 100644 --- a/find_db.sh +++ b/find_db.sh @@ -15,17 +15,19 @@ if [ -z "$1" ]; then package=TriggerInfoTool; else package=$1; fi if [ -z "$2" ]; then branch=2011; else branch=$2; fi if [ -z "$3" ]; then config=GeneralInfoAnalyzer/python/triggerinfoanalyzer_cfg.py; else config=$3; fi if [ -z "$4" ]; then globaltag=FT_53_LV5_AN1; else globaltag=$4; fi +if [ -z "$5" ]; then isdata=False; else isdata=$5; fi + dbfile="$globaltag".db cd $package exception=start i=0 echo In $(pwd) -echo Going to run $config +echo Going to run $config with isData $isdata while [ $exception != no ] do - cmsRun $config > full.log 2>&1 + cmsRun $config $isdata > full.log 2>&1 # find the exception from the cmsRun output exceptionmessage="$(awk '/Exception Message:/{flag=1;next}/----- End Fatal Exception /{flag=0}flag' full.log)" From 675b74be5284b9609ae6d37ebec9287f6d90b113 Mon Sep 17 00:00:00 2001 From: Kati Lassila-Perini Date: Mon, 28 Nov 2022 09:19:45 +0100 Subject: [PATCH 4/5] Update find_db.sh --- find_db.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/find_db.sh b/find_db.sh index 55f646e..f3f5616 100644 --- a/find_db.sh +++ b/find_db.sh @@ -8,8 +8,8 @@ # docker run -it --name my_cvmfs --volume "/cvmfs/cms-opendata-conddb.cern.ch:/mountedcvmfs/cms-opendata-conddb.cern.ch" -P -p 5901:5901 cmsopendata/cmssw_5_3_32_vnc:latest /bin/bash # Set up with prepare.sh -cd ~/CMSSW_5_3_32/src/ -source /opt/cms/cmsset_default.sh +# cd ~/CMSSW_5_3_32/src/ +# source /opt/cms/cmsset_default.sh if [ -z "$1" ]; then package=TriggerInfoTool; else package=$1; fi if [ -z "$2" ]; then branch=2011; else branch=$2; fi From f380b6e1abdce3572f76939e811f2396a9229763 Mon Sep 17 00:00:00 2001 From: Kati Lassila-Perini Date: Mon, 28 Nov 2022 09:37:02 +0100 Subject: [PATCH 5/5] Update find_db.sh --- find_db.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/find_db.sh b/find_db.sh index f3f5616..2cfc4dc 100644 --- a/find_db.sh +++ b/find_db.sh @@ -20,6 +20,13 @@ if [ -z "$5" ]; then isdata=False; else isdata=$5; fi dbfile="$globaltag".db cd $package +# fix this hack ... this is needed to find the cert file in data/ but if done in this way it does not make sense to pass the config as parameter... +if [ $package = PhysObjectExtractorTool ] +then + config=python/poet_cfg.py + cd PhysObjectExtractor +fi + exception=start i=0 echo In $(pwd)