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.
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
XeXe collision era and relval workflow #20749
Merged
Merged
Changes from 16 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
bf580de
Era to run customized pp reco for XeXe and a XeXe relval wf
mandrenguyen 3c3fe57
remove tau validation and other dqm/validation fixes
mandrenguyen 1e22923
Remove some spaces just to clean diff
mandrenguyen ac25b93
Improved style thanks to Matti's review
mandrenguyen e8245cc
fix undefined variable
mandrenguyen 262bce0
Fix missing parameter and minor typo
mandrenguyen 8643795
Fix accidental swap of originHalfLenght in MixedTriplets
mandrenguyen a5ba2a5
allow pp Reco to be repacked as well
mandrenguyen a726035
add ppEra_Run2_2017_pp_on_XeXe
mandrenguyen 66dc0a7
instead of dropping taus, increase the thresholds
mandrenguyen d50ab0c
make sure relevant sequences and tasks are named and are imported
mandrenguyen 8eddae5
disable boosted tau reco by bumping the thresholds for pp_on_XeXe_2017
mandrenguyen 6853293
Added PAT step and mini-AOD validation to wf 148
mandrenguyen 97cf091
More style changes for Matti
mandrenguyen d573a63
remove explicit type on originHalfLegnth in MixedTripletStep
mandrenguyen 3bd804e
Switch to fake2 HLT menu
mandrenguyen a28df62
Fix typo
mandrenguyen 7a6cb63
effectively disable corr function computations for subjets
mandrenguyen File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_pp_on_XeXe.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| #!/usr/bin/env python | ||
| """ | ||
| _ppEra_Run2_2017_pp_on_XeXe_ | ||
|
|
||
| Scenario supporting proton collisions | ||
|
|
||
| """ | ||
|
|
||
| import os | ||
| import sys | ||
|
|
||
| from Configuration.DataProcessing.Reco import Reco | ||
| import FWCore.ParameterSet.Config as cms | ||
| from Configuration.Eras.Era_Run2_2017_pp_on_XeXe_cff import Run2_2017_pp_on_XeXe | ||
|
|
||
| from Configuration.DataProcessing.Impl.pp import pp | ||
|
|
||
| class ppEra_Run2_2017_pp_on_XeXe(pp): | ||
| def __init__(self): | ||
| pp.__init__(self) | ||
| self.recoSeq='' | ||
| self.cbSc='pp' | ||
| self.addEI=True | ||
| self.isRepacked=True | ||
| self.eras=Run2_2017_pp_on_XeXe | ||
| self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_pp_on_XeXe' ] | ||
| self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_pp_on_XeXe' ] | ||
| self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_pp_on_XeXe' ] | ||
| """ | ||
| _ppEra_Run2_2017_pp_on_XeXe_ | ||
|
|
||
| Implement configuration building for data processing for proton | ||
| collision data taking for Run2 | ||
|
|
||
| """ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| from Configuration.Eras.Era_Run2_2017_cff import Run2_2017 | ||
| from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 | ||
|
|
||
| Run2_2017_pp_on_XeXe = cms.ModifierChain(Run2_2017, pp_on_XeXe_2017) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| pp_on_XeXe_2017 = cms.Modifier() | ||
|
|
139 changes: 139 additions & 0 deletions
139
Configuration/Generator/python/Hydjet_Quenched_MinBias_XeXe_5442GeV_cfi.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,139 @@ | ||
| import FWCore.ParameterSet.Config as cms | ||
|
|
||
| from Configuration.Generator.Pyquen2015Settings_cff import * | ||
| from Configuration.Generator.PythiaUESettings_cfi import * | ||
|
|
||
| generator = cms.EDFilter("HydjetGeneratorFilter", | ||
| aBeamTarget = cms.double(129.0), ## beam/target atomic number | ||
| comEnergy = cms.double(5442.0), | ||
| qgpInitialTemperature = cms.double(1.), ## initial temperature of QGP; allowed range [0.2,2.0]GeV; | ||
| qgpProperTimeFormation = cms.double(0.1), ## proper time of QGP formation; allowed range [0.01,10.0]fm/c; | ||
| hadronFreezoutTemperature = cms.double(0.125), | ||
| doRadiativeEnLoss = cms.bool(True), ## if true, perform partonic radiative en loss | ||
| doCollisionalEnLoss = cms.bool(True), | ||
| qgpNumQuarkFlavor = cms.int32(0), ## number of active quark flavors in qgp; allowed values: 0,1,2,3 | ||
| numQuarkFlavor = cms.int32(0), ## to be removed | ||
| sigmaInelNN = cms.double(70), | ||
| shadowingSwitch = cms.int32(1), | ||
| nMultiplicity = cms.int32(9000), | ||
| fracSoftMultiplicity = cms.double(1.), | ||
| maxLongitudinalRapidity = cms.double(2.3), | ||
| maxTransverseRapidity = cms.double(1.15), | ||
| angularSpectrumSelector = cms.int32(1), | ||
| rotateEventPlane = cms.bool(True), | ||
| allowEmptyEvents = cms.bool(False), | ||
| embeddingMode = cms.bool(False), | ||
| hydjetMode = cms.string('kHydroQJets'), | ||
|
|
||
| PythiaParameters = cms.PSet( | ||
| pythiaUESettingsBlock, | ||
| hydjetPythiaDefault = cms.vstring('MSEL=0 ! user processes', | ||
| 'CKIN(3)=8.15',# ! ptMin | ||
| 'MSTP(81)=1' | ||
| ), | ||
| myParameters = cms.vstring('MDCY(310,1)=0'), | ||
| pythiaJets = cms.vstring('MSUB(11)=1', # q+q->q+q | ||
| 'MSUB(12)=1', # q+qbar->q+qbar | ||
| 'MSUB(13)=1', # q+qbar->g+g | ||
| 'MSUB(28)=1', # q+g->q+g | ||
| 'MSUB(53)=1', # g+g->q+qbar | ||
| 'MSUB(68)=1' # g+g->g+g | ||
| ), | ||
| pythiaPromptPhotons = cms.vstring('MSUB(14)=1', # q+qbar->g+gamma | ||
| 'MSUB(18)=1', # q+qbar->gamma+gamma | ||
| 'MSUB(29)=1', # q+g->q+gamma | ||
| 'MSUB(114)=1', # g+g->gamma+gamma | ||
| 'MSUB(115)=1' # g+g->g+gamma | ||
| ), | ||
| pythiaZjets = cms.vstring('MSUB(15)=1', | ||
| 'MSUB(30)=1'), | ||
| pythiaCharmoniumNRQCD = cms.vstring('MSUB(421) = 1', | ||
| 'MSUB(422) = 1', | ||
| 'MSUB(423) = 1', | ||
| 'MSUB(424) = 1', | ||
| 'MSUB(425) = 1', | ||
| 'MSUB(426) = 1', | ||
| 'MSUB(427) = 1', | ||
| 'MSUB(428) = 1', | ||
| 'MSUB(429) = 1', | ||
| 'MSUB(430) = 1', | ||
| 'MSUB(431) = 1', | ||
| 'MSUB(432) = 1', | ||
| 'MSUB(433) = 1', | ||
| 'MSUB(434) = 1', | ||
| 'MSUB(435) = 1', | ||
| 'MSUB(436) = 1', | ||
| 'MSUB(437) = 1', | ||
| 'MSUB(438) = 1', | ||
| 'MSUB(439) = 1' | ||
| ), | ||
|
|
||
| pythiaBottomoniumNRQCD = cms.vstring('MSUB(461) = 1', | ||
| 'MSUB(462) = 1', | ||
| 'MSUB(463) = 1', | ||
| 'MSUB(464) = 1', | ||
| 'MSUB(465) = 1', | ||
| 'MSUB(466) = 1', | ||
| 'MSUB(467) = 1', | ||
| 'MSUB(468) = 1', | ||
| 'MSUB(469) = 1', | ||
| 'MSUB(470) = 1', | ||
| 'MSUB(471) = 1', | ||
| 'MSUB(472) = 1', | ||
| 'MSUB(473) = 1', | ||
| 'MSUB(474) = 1', | ||
| 'MSUB(475) = 1', | ||
| 'MSUB(476) = 1', | ||
| 'MSUB(477) = 1', | ||
| 'MSUB(478) = 1', | ||
| 'MSUB(479) = 1', | ||
| ), | ||
| pythiaWeakBosons = cms.vstring('MSUB(1)=1', | ||
| 'MSUB(2)=1'), | ||
| pythiaQuarkoniaSettings = cms.vstring('PARP(141)=1.16', # Matrix Elements | ||
| 'PARP(142)=0.0119', | ||
| 'PARP(143)=0.01', | ||
| 'PARP(144)=0.01', | ||
| 'PARP(145)=0.05', | ||
| 'PARP(146)=9.28', | ||
| 'PARP(147)=0.15', | ||
| 'PARP(148)=0.02', | ||
| 'PARP(149)=0.02', | ||
| 'PARP(150)=0.085', | ||
| # Meson spin | ||
| 'PARJ(13)=0.60', | ||
| 'PARJ(14)=0.162', | ||
| 'PARJ(15)=0.018', | ||
| 'PARJ(16)=0.054', | ||
| # Polarization | ||
| 'MSTP(145)=0', | ||
| 'MSTP(146)=0', | ||
| 'MSTP(147)=0', | ||
| 'MSTP(148)=1', | ||
| 'MSTP(149)=1', | ||
| # Chi_c branching ratios | ||
| 'BRAT(861)=0.202', | ||
| 'BRAT(862)=0.798', | ||
| 'BRAT(1501)=0.013', | ||
| 'BRAT(1502)=0.987', | ||
| 'BRAT(1555)=0.356', | ||
| 'BRAT(1556)=0.644' | ||
| ), | ||
| # Quarkonia and Weak Bosons added back upon dilepton group's request. | ||
| parameterSets = cms.vstring('pythiaUESettings', | ||
| 'hydjetPythiaDefault', | ||
| 'myParameters', | ||
| 'pythiaJets', | ||
| 'pythiaPromptPhotons', | ||
| 'pythiaZjets', | ||
| 'pythiaBottomoniumNRQCD', | ||
| 'pythiaCharmoniumNRQCD', | ||
| 'pythiaQuarkoniaSettings', | ||
| 'pythiaWeakBosons' | ||
| ) | ||
| ), | ||
| cFlag = cms.int32(1), | ||
| bMin = cms.double(0), | ||
| bMax = cms.double(30), | ||
| bFixed = cms.double(0) | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ecalAndPreshawerDigis -> ecalAndPreshowerDigis
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@perrotta Since this doesn't change the functionality, I will let the ongoing test finish rather than push a fix for this typo now. As a reviewer, I believe you can fix it directly if you'd like. Otherwise, I will wait till morning.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mandrenguyen : I can't fix myself this PR. In any case, it is fine for me waiting for the test to finish, of course.