Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ALCA-DB] Various fixes/improvements for unit test #40971

Closed
wants to merge 1 commit into from
Closed

[ALCA-DB] Various fixes/improvements for unit test #40971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions CondFormats/Common/test/BuildFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,4 @@
<bin file="testSerializationCommon.cpp">
</bin>

<environment>
<bin file="testDropboxMetadataDB.cpp">
<flags TEST_RUNNER_ARGS=" /bin/bash CondFormats/Common/test createTestDBObjects.sh"/>
<use name="FWCore/Utilities"/>
</bin>
</environment>
<test name="testDropboxMetadataDB" command="createTestDBObjects.sh"/>
4 changes: 2 additions & 2 deletions CondFormats/Common/test/ProduceDropBoxMetadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
)

# process.PoolDBOutputService.DBParameters.messageLevel = 3
import json
import json, os

def encodeJsonInString(filename):
"""This function open the json file and encodes it in a string replacing probelamtic characters"""
thefile = open("../data/"+filename)
thefile = open(os.path.join(os.path.dirname(__file__), "..", "data", filename))
thejson = json.load(thefile)
thefile.close()
return json.JSONEncoder().encode(thejson).replace('"',"&quot;")
Expand Down
5 changes: 2 additions & 3 deletions CondFormats/Common/test/createTestDBObjects.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
function die { echo $1: status $2 ; exit $2; }

echo -e "TESTING Dropbox Metadata DB codes ...\n\n"
cd ${LOCAL_TEST_DIR}/
cmsRun ProduceDropBoxMetadata.py || die "Failure running ProduceDropBoxMetadata.py" $?
cmsRun ${CMSSW_BASE}/src/CondFormats/Common/test/ProduceDropBoxMetadata.py || die "Failure running ProduceDropBoxMetadata.py" $?

echo -e "TESTING Dropbox Metadata DB Reader code ...\n Reading local sqlite DropBoxMetadata.db \n\n "
cmsRun DropBoxMetadataReader.py || die "Failure running DropBoxMetadataReader.py" $?
cmsRun ${CMSSW_BASE}/src/CondFormats/Common/test/DropBoxMetadataReader.py || die "Failure running DropBoxMetadataReader.py" $?

2 changes: 0 additions & 2 deletions CondFormats/Common/test/testDropboxMetadataDB.cpp
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_2017.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
# (QCD 1.8TeV DeepCore)
# (TTbar DigiNoHLT)
# 2023 (TTbar, TTbar PU, TTbar PU premix)
# (TTbar FastSim)
# 2024 (TTbar, TTbar PU, TTbar PU premix)
numWFIB = [10001.0,10002.0,10003.0,10004.0,10005.0,10006.0,10007.0,10008.0,10009.0,10059.0,10071.0,
10042.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0,10424.0,
Expand Down Expand Up @@ -81,6 +82,7 @@
11723.17,
11634.601,
12434.0,12634.0,12634.99,
14034.0,
12834.0,13034.0,13034.99,]
for numWF in numWFIB:
if not numWF in _upgrade_workflows: continue
Expand Down
14 changes: 12 additions & 2 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
'2021FSPU',
'2021postEE',
'2021postEEPU',
'2023FS',
'2023FSPU',
]

upgradeKeys[2026] = [
Expand Down Expand Up @@ -2079,7 +2081,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
else:
stepDict[stepName][k] = merge([stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
return '2021FS' in key
return ('2021FS' in key or '2023FS' in key)
upgradeWFs['Run3FStrackingOnly'] = UpgradeWorkflow_Run3FStrackingOnly(
steps = [
'Gen',
Expand All @@ -2106,7 +2108,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
else:
stepDict[stepName][k] = None
def condition(self, fragment, stepList, key, hasHarvest):
return '2021FS' in key and fragment=="MinBias_14TeV"
return ('2021FS' in key or '2023FS' in key) and fragment=="MinBias_14TeV"
upgradeWFs['Run3FSMBMixing'] = UpgradeWorkflow_Run3FSMBMixing(
steps = [
'Gen',
Expand Down Expand Up @@ -2340,6 +2342,14 @@ def condition(self, fragment, stepList, key, hasHarvest):
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
'ScenToRun' : ['GenSim','Digi','RecoNano','HARVESTNano','ALCA'],
},
'2023FS' : {
'Geom' : 'DB:Extended',
'GT' : 'auto:phase1_2023_realistic',
'HLTmenu': '@relval2022',
'Era' : 'Run3_FastSim',
'BeamSpot': 'Realistic25ns13p6TeVEarly2022Collision',
'ScenToRun' : ['Gen','FastSimRun3','HARVESTFastRun3'],
},
}

# standard PU sequences
Expand Down