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

Changing quotes of AlCa matrix to be JSON valid #15139

Merged
merged 2 commits into from
Jul 9, 2016
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 25 additions & 25 deletions Configuration/AlCa/python/autoAlca.py
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
AlCaRecoMatrix = {'AlCaLumiPixels' : 'LumiPixels',
'Charmonium' : 'TkAlJpsiMuMu',
'Commissioning' : 'HcalCalIsoTrk',
'Cosmics' : 'TkAlCosmics0T+MuAlGlobalCosmics+HcalCalHOCosmics+DtCalibCosmics',
'DoubleEG' : 'EcalCalZElectron+EcalUncalZElectron+HcalCalIterativePhiSym+HcalCalIsoTrkFilter',
'DoubleElectron' : 'EcalCalZElectron+EcalUncalZElectron+HcalCalIsoTrkFilter',
'DoubleMu' : 'MuAlCalIsolatedMu+MuAlOverlaps+DtCalib+TkAlZMuMu',
'DoubleMuon' : 'TkAlZMuMu+MuAlCalIsolatedMu+MuAlOverlaps+MuAlZMuMu+DtCalib',
'DoubleMuParked' : 'MuAlCalIsolatedMu+MuAlOverlaps+DtCalib+TkAlZMuMu',
'HLTPhysics' : 'SiStripCalMinBias+TkAlMinBias+HcalCalIsoTrkFilter',
'JetHT' : 'HcalCalDijets+HcalCalIsoTrkFilter+HcalCalIsolatedBunchFilter',
'MET' : 'HcalCalNoise',
'MinimumBias' : 'SiStripCalMinBias+TkAlMinBias',
'MuOnia' : 'TkAlJpsiMuMu+TkAlUpsilonMuMu',
'MuOniaParked' : 'TkAlJpsiMuMu+TkAlUpsilonMuMu',
'SingleElectron' : 'EcalCalWElectron+EcalUncalWElectron+EcalCalZElectron+EcalUncalZElectron+EcalESAlign+HcalCalIterativePhiSym+HcalCalIsoTrkFilter',
'SingleMu' : 'MuAlCalIsolatedMu+MuAlOverlaps+TkAlMuonIsolated+DtCalib+MuAlZMuMu+HcalCalHO',
'SingleMuon' : 'TkAlMuonIsolated+DtCalib+MuAlCalIsolatedMu+MuAlOverlaps+MuAlZMuMu+HcalCalIterativePhiSym',
'SinglePhoton' : 'HcalCalGammaJet',
'ZeroBias' : 'SiStripCalZeroBias+TkAlMinBias+LumiPixelsMinBias+SiStripCalMinBias+EcalTrg',
'StreamExpress' : 'SiStripCalZeroBias+TkAlMinBias+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAfterAbortGap+DtCalib+Hotline+LumiPixelsMinBias',
'StreamExpressHI': 'SiStripCalZeroBias+TkAlMinBiasHI+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAfterAbortGap+DtCalibHI',
'ExpressCosmics' : 'SiStripCalZeroBias+TkAlCosmics0T',
AlCaRecoMatrix = {"AlCaLumiPixels" : "LumiPixels",
"Charmonium" : "TkAlJpsiMuMu",
"Commissioning" : "HcalCalIsoTrk",
"Cosmics" : "TkAlCosmics0T+MuAlGlobalCosmics+HcalCalHOCosmics+DtCalibCosmics",
"DoubleEG" : "EcalCalZElectron+EcalUncalZElectron+HcalCalIterativePhiSym+HcalCalIsoTrkFilter",
"DoubleElectron" : "EcalCalZElectron+EcalUncalZElectron+HcalCalIsoTrkFilter",
"DoubleMu" : "MuAlCalIsolatedMu+MuAlOverlaps+DtCalib+TkAlZMuMu",
"DoubleMuon" : "TkAlZMuMu+MuAlCalIsolatedMu+MuAlOverlaps+MuAlZMuMu+DtCalib",
"DoubleMuParked" : "MuAlCalIsolatedMu+MuAlOverlaps+DtCalib+TkAlZMuMu",
"HLTPhysics" : "SiStripCalMinBias+TkAlMinBias+HcalCalIsoTrkFilter",
"JetHT" : "HcalCalDijets+HcalCalIsoTrkFilter+HcalCalIsolatedBunchFilter",
"MET" : "HcalCalNoise",
"MinimumBias" : "SiStripCalMinBias+TkAlMinBias",
"MuOnia" : "TkAlJpsiMuMu+TkAlUpsilonMuMu",
"MuOniaParked" : "TkAlJpsiMuMu+TkAlUpsilonMuMu",
"SingleElectron" : "EcalCalWElectron+EcalUncalWElectron+EcalCalZElectron+EcalUncalZElectron+EcalESAlign+HcalCalIterativePhiSym+HcalCalIsoTrkFilter",
"SingleMu" : "MuAlCalIsolatedMu+MuAlOverlaps+TkAlMuonIsolated+DtCalib+MuAlZMuMu+HcalCalHO",
"SingleMuon" : "TkAlMuonIsolated+DtCalib+MuAlCalIsolatedMu+MuAlOverlaps+MuAlZMuMu+HcalCalIterativePhiSym",
"SinglePhoton" : "HcalCalGammaJet",
"ZeroBias" : "SiStripCalZeroBias+TkAlMinBias+LumiPixelsMinBias+SiStripCalMinBias",
Copy link

Choose a reason for hiding this comment

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

@jonuuukas from the title of the PR I would expect that you change only from single to double quotes, but here you are removing '+EcalTrg'. Is that intended?

Copy link
Contributor

Choose a reason for hiding this comment

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

@ghellwig sure it is not.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

that is not intended, sorry. fixing ASAP

"StreamExpress" : "SiStripCalZeroBias+TkAlMinBias+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAfterAbortGap+DtCalib+Hotline+LumiPixelsMinBias",
"StreamExpressHI": "SiStripCalZeroBias+TkAlMinBiasHI+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAfterAbortGap+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' : '',
"AlCaP0" : "",
# ---------------------------------------------------------------------------------------------------------------------------
'HcalNZS' : 'HcalCalMinBias'
"HcalNZS" : "HcalCalMinBias"
# This is in the AlCaRecoMatrix, but no RelVals are produced
# 'TestEnablesTracker' : 'TkAlLAS'
# 'TestEnablesEcalHcal' : 'HcalCalPedestal'
Expand Down