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

Update HLT menu (V4) [81X] #15875

Merged
merged 21 commits into from
Sep 19, 2016
+238,483 −65,297
Merged

Update HLT menu (V4) [81X] #15875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
431956e
Update HLT menu up to /dev/CMSSW_8_0_0/HLT/V466
perrotta Aug 18, 2016
02fa0ce
Update txt's
perrotta Aug 18, 2016
e164716
Update HLT menu up to /dev/CMSSW_8_0_0/HLT/V473
perrotta Aug 18, 2016
960a69b
Remove paths from CMSHLT-981 from GRun
perrotta Aug 18, 2016
efe1d92
Update HLT menu up to /dev/CMSSW_8_0_0/HLT/V478
perrotta Aug 19, 2016
6996ab1
Update HLT menu up to /dev/CMSSW_8_0_0/HLT/V484
perrotta Aug 20, 2016
04bbfc7
Update HLT menu up to /dev/CMSSW_8_0_0/HLT/V485 and L1 menu as Global…
perrotta Aug 24, 2016
569bde5
Migration for and including CMSHLT-984
Martin-Grunewald Aug 25, 2016
b436fde
Update HLT menu up to /dev/CMSSW_8_0_0/HLT/V488
perrotta Aug 29, 2016
3acea80
Migration / ESInputTag fix / devel
Martin-Grunewald Aug 30, 2016
deb5b7d
Customisation for #15499 (81X only)
Martin-Grunewald Sep 1, 2016
c7f14bd
HLT development
Martin-Grunewald Sep 8, 2016
6569160
HLT development
Martin-Grunewald Sep 8, 2016
493d785
HLT V4 menu
silviodonato Sep 12, 2016
9f24e73
Fix customisation
Martin-Grunewald Sep 13, 2016
efaf0ee
Fix the customisation fix
Martin-Grunewald Sep 13, 2016
7b0230c
final HLT V4 menu
silviodonato Sep 15, 2016
e434ebf
fix on tau triggers, again
silviodonato Sep 15, 2016
c96f037
sync with V536
silviodonato Sep 16, 2016
8ff712e
Add new frozen menu 25ns15e33_v4
Martin-Grunewald Sep 16, 2016
b30818f
Picking from #15879
mmusich Sep 16, 2016
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
16 changes: 8 additions & 8 deletions Configuration/AlCa/python/autoCond.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run1
'run1_mc_pa' : '81X_mcRun1_pA_v2',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Run2
'run2_design' : '81X_mcRun2_design_v6',
'run2_design' : '81X_mcRun2_design_v7',
# GlobalTag for MC production with pessimistic alignment and calibrations for Run2
'run2_mc_50ns' : '81X_mcRun2_startup_v8',
'run2_mc_50ns' : '81X_mcRun2_startup_v9',
#GlobalTag for MC production with optimistic alignment and calibrations for Run2
'run2_mc' : '81X_mcRun2_asymptotic_v7',
'run2_mc' : '81X_mcRun2_asymptotic_v8',
# GlobalTag for MC production (cosmics) with starup-like alignment and calibrations for Run2, Strip tracker in peak mode
'run2_mc_cosmics' : '81X_mcRun2cosmics_startup_peak_v6',
'run2_mc_cosmics' : '81X_mcRun2cosmics_startup_peak_v7',
# GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
'run2_mc_hi' : '81X_mcRun2_HeavyIon_v8',
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2
Expand All @@ -26,19 +26,19 @@
# GlobalTag for Run2 data reprocessing
'run2_data' : '81X_dataRun2_v7',
# GlobalTag for Run2 data relvals: allows customization to run with fixed L1 menu
'run2_data_relval' : '81X_dataRun2_relval_v8',
'run2_data_relval' : '81X_dataRun2_relval_v9',
# GlobalTag for Run1 HLT: it points to the online GT
'run1_hlt' : '81X_dataRun2_HLT_frozen_v1',
# GlobalTag for Run2 HLT: it points to the online GT
'run2_hlt' : '81X_dataRun2_HLT_frozen_v1',
# GlobalTag for Run2 HLT RelVals: customizations to run with fixed L1 Menu
'run2_hlt_relval' : '81X_dataRun2_HLT_relval_v2',
'run2_hlt_relval' : '81X_dataRun2_HLT_relval_v3',
# GlobalTag for Run2 HLT for HI: it points to the online GT
'run2_hlt_hi' : '81X_dataRun2_HLTHI_frozen_v1',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017
'phase1_2017_design' : '81X_upgrade2017_design_v9',
'phase1_2017_design' : '81X_upgrade2017_design_v10',
# GlobalTag for MC production with realistic conditions for for Phase1 2017 detector
'phase1_2017_realistic': '81X_upgrade2017_realistic_v11',
'phase1_2017_realistic': '81X_upgrade2017_realistic_v12',
# Global Tag for MC production with development HCAL conditions for Phase1 2017 detector
'phase1_2017_hcaldev' : '81X_upgrade2017_HCALdev_v1',
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019
Expand Down
10 changes: 7 additions & 3 deletions Configuration/HLT/python/autoCondHLT.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
l1Menus= {
'Fake' : ( ','.join( [ 'L1GtTriggerMenu_L1Menu_Collisions2012_v3_mc' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'Fake1' : ( ','.join( [ 'L1Menu_Collisions2015_25nsStage1_v5' , l1MenuRecord,connectionString, l1MenuLabel, "2015-10-26 12:00:00.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2016_v6_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-07-19 10:00:00.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2016_v6_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-07-19 10:00:00.000"] ), ),
'FULL' : ( ','.join( [ 'L1Menu_Collisions2016_v6r5_ugt_1board_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-08-23 20:00:00.000"] ), ),
'GRun' : ( ','.join( [ 'L1Menu_Collisions2016_v6r5_ugt_1board_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-08-23 20:00:00.000"] ), ),
'25ns15e33_v4' : ( ','.join( [ 'L1Menu_Collisions2016_v6r5_ugt_1board_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-08-23 20:00:00.000"] ), ),
'25ns10e33_v2' : ( ','.join( [ 'L1Menu_Collisions2016_v4_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-05-24 14:55:00.000"] ), ),
'HIon' : ( ','.join( [ 'L1Menu_CollisionsHeavyIons2015_v5_uGT_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_Collisions2016_v6_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-07-19 10:00:00.000"] ), ),
'PIon' : ( ','.join( [ 'L1Menu_Collisions2016_v6r5_ugt_1board_xml' ,l1tMenuRecord,connectionString,l1tMenuLabel, "2016-08-23 20:00:00.000"] ), ),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@silviodonato, we are updating in parallel the content of the L1 menu in Global Tag. It would be nice to avoid customization once integrated @franzoni

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Marco,, these are the TSG internal GTs where we do that all the time....

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Martin-Grunewald so are we expecting this PR to fail the tests?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It depends: currently the @RelVal still points to the previous menu.
We should probably change it to point to the new frozen menu, and then the relvals
which of course use official GTs will fail until those GTs are updated with the new L1 menu.
How do we proceed? You make new GTs and a PR whose commit we add to this one as in the past?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am updating the GTs in this very moment. I'll notify you once I have the commit done, so that you can cherry-pick it and change the @relval menu.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For 80 and 81? Given that MC production with the new HLT menu is with 80, and 81 should not lag behind 81....

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess your last statement, not to be circular, should read:

81 should not lag behind 80

....

so both, but 81x first.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case you are willing to do the change #15879 might be interesting for you

'PRef' : ( ','.join( [ 'L1Menu_Collisions2015_5TeV_pp_reference_v5_uGT_v2_mc_xml',l1tMenuRecord,connectionString,l1tMenuLabel, "2016-03-04 15:00:00.000"] ), ),
}

Expand All @@ -35,6 +36,7 @@
'run2_mc_Fake1' : ('run2_mc' ,l1Menus['Fake1']),
'run2_mc_FULL' : ('run2_mc' ,l1Menus['FULL']),
'run2_mc_GRun' : ('run2_mc' ,l1Menus['GRun']),
'run2_mc_25ns15e33_v4' : ('run2_mc' ,l1Menus['25ns15e33_v4']),
'run2_mc_25ns10e33_v2' : ('run2_mc' ,l1Menus['25ns10e33_v2']),
'run2_mc_HIon' : ('run2_mc_hi' ,l1Menus['HIon']),
'run2_mc_PIon' : ('run2_mc' ,l1Menus['PIon']),
Expand All @@ -45,6 +47,7 @@
'run2_hlt_Fake1' : ('run2_hlt_relval' ,l1Menus['Fake1']),
'run2_hlt_FULL' : ('run2_hlt_relval' ,l1Menus['FULL']),
'run2_hlt_GRun' : ('run2_hlt_relval' ,l1Menus['GRun']),
'run2_hlt_25ns15e33_v4' : ('run2_hlt_relval' ,l1Menus['25ns15e33_v4']),
'run2_hlt_25ns10e33_v2' : ('run2_hlt_relval' ,l1Menus['25ns10e33_v2']),
'run2_hlt_HIon' : ('run2_hlt_hi' ,l1Menus['HIon']),
'run2_hlt_PIon' : ('run2_hlt_relval' ,l1Menus['PIon']),
Expand All @@ -55,6 +58,7 @@
'run2_data_Fake1' : ('run2_data_relval' ,l1Menus['Fake1']),
'run2_data_FULL' : ('run2_data_relval' ,l1Menus['FULL']),
'run2_data_GRun' : ('run2_data_relval' ,l1Menus['GRun']),
'run2_data_25ns15e33_v4' : ('run2_data_relval' ,l1Menus['25ns15e33_v4']),
'run2_data_25ns10e33_v2' : ('run2_data_relval' ,l1Menus['25ns10e33_v2']),
'run2_data_HIon' : ('run2_data' ,l1Menus['HIon']),
'run2_data_PIon' : ('run2_data_relval' ,l1Menus['PIon']),
Expand Down
Loading