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

Fixing AlCa Matrix 80X #12754

Merged
merged 1 commit into from
Dec 14, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 22 additions & 12 deletions Configuration/AlCa/python/autoAlca.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,33 @@
AlCaRecoMatrix = {'ExpressCosmics' : 'SiStripCalZeroBias+TkAlCosmics0T',
'StreamExpress' : 'SiStripCalZeroBias+TkAlMinBias+SiStripPCLHistos+SiStripCalMinBias+DtCalib+Hotline',
'StreamExpressHI': 'SiStripCalZeroBias+TkAlMinBiasHI+SiStripPCLHistos+SiStripCalMinBias+DtCalibHI',
'MinimumBias' : 'SiStripCalMinBias+TkAlMinBias',
AlCaRecoMatrix = {'AlCaLumiPixels' : 'LumiPixels',
'Charmonium' : 'TkAlJpsiMuMu',
'Commissioning' : 'HcalCalIsoTrk',
'SingleMu' : 'MuAlCalIsolatedMu+MuAlOverlaps+TkAlMuonIsolated+DtCalib',
'DoubleMu' : 'MuAlCalIsolatedMu+MuAlOverlaps+DtCalib+TkAlZMuMu',
'MuOnia' : 'TkAlJpsiMuMu+TkAlUpsilonMuMu',
'SingleElectron' : 'EcalCalWElectron+EcalUncalWElectron',
'Cosmics' : 'TkAlCosmics0T+MuAlGlobalCosmics+HcalCalHOCosmics+DtCalibCosmics',
'DoubleEG' : 'EcalCalZElectron+EcalUncalZElectron+HcalCalIterativePhiSym',
'DoubleElectron' : 'EcalCalZElectron+EcalUncalZElectron',
'AlCaLumiPixels' : 'LumiPixels',
'DoubleMu' : 'MuAlCalIsolatedMu+MuAlOverlaps+DtCalib+TkAlZMuMu',
'DoubleMuon' : 'TkAlZMuMu+MuAlCalIsolatedMu+MuAlOverlaps+MuAlZMuMu+DtCalib',
'DoubleMuParked' : 'MuAlCalIsolatedMu+MuAlOverlaps+DtCalib+TkAlZMuMu',
'HLTPhysics' : 'SiStripCalMinBias+TkAlMinBias',
'JetHT' : 'HcalCalDijets',
'MET' : 'HcalCalNoise',
'MinimumBias' : 'SiStripCalMinBias+TkAlMinBias',
'MuOnia' : 'TkAlJpsiMuMu+TkAlUpsilonMuMu',
'MuOniaParked' : 'TkAlJpsiMuMu+TkAlUpsilonMuMu',
'Cosmics' : 'TkAlCosmics0T+MuAlGlobalCosmics+HcalCalHOCosmics+DtCalibCosmics',
'SingleElectron' : 'EcalCalWElectron+EcalUncalWElectron+EcalCalZElectron+EcalUncalZElectron+HcalCalIterativePhiSym',
'SingleMu' : 'MuAlCalIsolatedMu+MuAlOverlaps+TkAlMuonIsolated+DtCalib+MuAlZMuMu',
'SingleMuon' : 'TkAlMuonIsolated+DtCalib+MuAlCalIsolatedMu+MuAlOverlaps+MuAlZMuMu+HcalCalIterativePhiSym',
'SinglePhoton' : 'HcalCalGammaJet',
'ZeroBias' : 'SiStripCalZeroBias+TkAlMinBias+LumiPixelsMinBias+SiStripCalMinBias',
'StreamExpress' : 'SiStripCalZeroBias+TkAlMinBias+SiStripPCLHistos+SiStripCalMinBias+DtCalib+Hotline+LumiPixelsMinBias',
'StreamExpressHI': 'SiStripCalZeroBias+TkAlMinBiasHI+SiStripPCLHistos+SiStripCalMinBias+DtCalibHI',
'ExpressCosmics' : 'SiStripCalZeroBias+TkAlCosmics0T',
# These two cannot run on RAW, they are just meant to run on the dedicated AlcaRAW so they do not enter the allForPrompt list
'AlCaP0' : '',
# ---------------------------------------------------------------------------------------------------------------------------
'HcalNZS' : 'HcalCalMinBias'
# This is in the AlCaRecoMatrix, but no RelVals are produced
# 'TestEnablesTracker' : 'TkAlLAS'
# 'TestEnablesTracker' : 'TkAlLAS'
# 'TestEnablesEcalHcal' : 'HcalCalPedestal'
}

def buildList(pdList, matrix):
Expand All @@ -36,7 +46,7 @@ def buildList(pdList, matrix):
return stringList

# Update the lists anytime a new PD is added to the matrix
autoAlca = { 'allForPrompt' : buildList(['MinimumBias', 'Commissioning', 'SingleMu', 'DoubleMu', 'MuOnia', 'DoubleMuParked', 'MuOniaParked', 'SingleElectron', 'DoubleElectron', 'HcalNZS'], AlCaRecoMatrix),
autoAlca = { 'allForPrompt' : buildList(['Charmonium', 'Commissioning', 'DoubleEG', 'DoubleElectron', 'DoubleMu', 'DoubleMuParked', 'DoubleMuon', 'HLTPhysics', 'HcalNZS', 'JetHT', 'MET', 'MinimumBias', 'MuOnia', 'MuOniaParked', 'SingleElectron', 'SingleMu', 'SingleMuon', 'SinglePhoton', 'ZeroBias'], AlCaRecoMatrix),
'allForExpress' : buildList(['StreamExpress'], AlCaRecoMatrix),
'allForExpressHI' : buildList(['StreamExpressHI'], AlCaRecoMatrix),
'allForPromptCosmics' : buildList(['Cosmics'], AlCaRecoMatrix),
Expand Down
4 changes: 2 additions & 2 deletions Configuration/AlCa/python/autoCond.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
# GlobalTag for MC production (Heavy Ions collisions) with optimistic alignment and calibrations for Run2
'run2_mc_hi' : '76X_mcRun2_HeavyIon_v12',
# GlobalTag for Run1 data reprocessing
'run1_data' : '76X_dataRun1_v15',
'run1_data' : '80X_dataRun1_v0',
# GlobalTag for Run2 data reprocessing
'run2_data' : '76X_dataRun2_v15',
'run2_data' : '80X_dataRun2_v0',
# GlobalTag for Run1 HLT: it points to the online GT
'run1_hlt' : '76X_dataRun1_HLT_frozen_v10',
# GlobalTag for Run2 HLT: it points to the online GT
Expand Down