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.

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

Ecal phase2 new digitization 11 2 x #31726

Merged
merged 30 commits into from
Nov 25, 2020
Merged
Changes from 4 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
09ee5b4
Move EcalDigiSimRecoPhase2 from 11_1_X to 11_2_X
dariosol Oct 8, 2020
921a4c7
Add code formats
dariosol Oct 8, 2020
47d5b27
Modify from Era_Phase2C10_Ecal_Devel to Era_Phase2C11_Ecal_Devel
dariosol Oct 9, 2020
26b327a
fix typo in Eras.py
dariosol Oct 9, 2020
ac272c7
fix eras with last version
dariosol Oct 9, 2020
09dee48
fix eras
dariosol Oct 9, 2020
b797ece
Take pulse shape from database
dariosol Oct 13, 2020
1c6eadc
Remove conddb local file call
dariosol Oct 13, 2020
b3bab5b
put back timeDependent parameter
dariosol Oct 20, 2020
edb236f
Checks on Ecal Lite DTU Coder
dariosol Oct 22, 2020
f24b107
Remove ES parameter from ecal Digitizer Phase2
dariosol Oct 22, 2020
a2b2a57
change python script for ecal digi phase2
dariosol Oct 22, 2020
9f47a87
Remove pulseshape from repo
dariosol Oct 22, 2020
495c566
Remove phase 2 digis from premix
dariosol Oct 22, 2020
da7bc0e
code formats
dariosol Oct 22, 2020
d63c30b
add ecal devel special workflow
kpedro88 Oct 22, 2020
7f23644
temporarily remove trigger and downstream steps for ecal devel wf
kpedro88 Oct 22, 2020
7d7fa8d
remove unneeded Era
kpedro88 Oct 22, 2020
2b887b5
Merge pull request #1 from kpedro88/EcalPhase2NewDigitization_11_2_X_…
dariosol Oct 23, 2020
65e5511
Move clone in ecalDigis_cfi
dariosol Oct 28, 2020
eececcb
Changed Digi definition in EBDigiCollectionPh2
dariosol Nov 4, 2020
571f1cb
Take values from records in correct way in EcalDigiProducer_Ph2
dariosol Nov 4, 2020
37c3122
Removed useless include in EBDataFrame
dariosol Nov 4, 2020
6b8e764
fix typo
dariosol Nov 4, 2020
4cc80a8
Add code formats
dariosol Nov 4, 2020
f9aa038
Add dependency of EBDetID in EcalDataFrame_Ph2
dariosol Nov 6, 2020
6bf7919
Removed useless comments
dariosol Nov 10, 2020
58a8a67
Add token to checkgeometry
dariosol Nov 10, 2020
f757774
Removed dependency already in the header
dariosol Nov 11, 2020
00980d2
Moved EcalConstants from CondFormats to DataFormats
dariosol Nov 11, 2020
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: 0 additions & 7 deletions Configuration/Eras/python/Era_Phase2C11_Ecal_Devel_cff.py

This file was deleted.

Original file line number Diff line number Diff line change
@@ -584,6 +584,30 @@ def condition(self, fragment, stepList, key, hasHarvest):
offset = 0.6,
)

class UpgradeWorkflow_ecalDevel(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
# temporarily remove trigger & downstream steps
mods = {'--era': stepDict[step][k]['--era']+',phase2_ecal_devel'}
if 'Digi' in step:
mods['-s'] = 'DIGI:pdigi_valid'
stepDict[stepName][k] = merge([mods, stepDict[step][k]])
def condition(self, fragment, stepList, key, hasHarvest):
return fragment=="TTbar_14TeV" and '2026' in key
upgradeWFs['ecalDevel'] = UpgradeWorkflow_ecalDevel(
steps = [
'DigiTrigger',
'RecoGlobal',
'HARVESTGlobal',
],
PU = [
'DigiTrigger',
'RecoGlobal',
'HARVESTGlobal',
],
suffix = '_ecalDevel',
offset = 0.61,
)

class UpgradeWorkflow_0T(UpgradeWorkflow):
def setup_(self, step, stepName, stepDict, k, properties):
myGT=stepDict[step][k]['--conditions']
1 change: 0 additions & 1 deletion Configuration/StandardSequences/python/Eras.py
Original file line number Diff line number Diff line change
@@ -44,7 +44,6 @@ def __init__(self):
'Phase2C11_dd4hep',
'Phase2C12_dd4hep',
'Phase2C11M9',
'Phase2C11_Ecal_Devel'
]

internalUseMods = ['run2_common', 'run2_25ns_specific',