Merge pull request #23663 from tocheng/AlCaRecoMatrix2018_for_CMSSW_1…

…0_2_X AlCaRecoMatrix for 2018
cms-sw · Jun 25, 2018 · 1dddadb · 1dddadb
2 parents 5528b18 + 7a48c12
commit 1dddadb
Showing 1 changed file with 44 additions and 1 deletion.
diff --git a/Configuration/AlCa/python/autoAlca.py b/Configuration/AlCa/python/autoAlca.py
@@ -4,6 +4,8 @@
                   "Cosmics"        : "TkAlCosmics0T+MuAlGlobalCosmics+DtCalibCosmics",
                   "DoubleEG"       : "EcalCalZElectron+EcalUncalZElectron+HcalCalIterativePhiSym+HcalCalIsoTrkFilter",
                   "DoubleMuon"     : "TkAlZMuMu+MuAlCalIsolatedMu+MuAlOverlaps+MuAlZMuMu+DtCalib",
+                  # New PD in 2018 to replace SinglePhoton SingleElectron and DoubleEG in 2017
+                  "EGamma"         : "EcalESAlign+EcalUncalWElectron+EcalUncalZElectron+HcalCalIsoTrkFilter+HcalCalIterativePhiSym",
                   "HLTPhysics"     : "TkAlMinBias",
                   "JetHT"          : "HcalCalIsoTrkFilter+HcalCalIsolatedBunchFilter",
                   "MinimumBias"    : "SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias",
@@ -14,10 +16,13 @@
                   "SinglePhoton"   : "HcalCalGammaJet",
                   "ZeroBias"       : "SiStripCalZeroBias+TkAlMinBias+LumiPixelsMinBias+SiStripCalMinBias+AlCaPCCZeroBiasFromRECO", 
 
-                  "Express"  : "SiStripCalZeroBias+TkAlMinBias+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAAG+DtCalib+Hotline+LumiPixelsMinBias+SiPixelCalZeroBias",
+                  "Express"        : "SiStripCalZeroBias+TkAlMinBias+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAAG+DtCalib+Hotline+LumiPixelsMinBias+SiPixelCalZeroBias",
                   "ExpressCosmics" : "SiStripPCLHistos+SiStripCalZeroBias+TkAlCosmics0T+DtCalibCosmics+SiPixelCalZeroBias",
                   "ExpressAlignment":"TkAlMinBias",
+                  # Used for new PCC PCL introduced in 2018
+                  "AlcaLumiPixelsExpress":"AlCaPCCRandom",
                   # These two cannot run on RAW, they are just meant to run on the dedicated AlcaRAW so they do not enter the allForPrompt list
+                  "AlCaPhiSym"     : "",
                   "AlCaP0"         : "",
                   # ---------------------------------------------------------------------------------------------------------------------------
                   "HcalNZS"        : "HcalCalMinBias",
@@ -34,6 +39,44 @@
                   "StreamExpressHI" : "SiStripCalZeroBias+TkAlMinBiasHI+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAAG+DtCalibHI+SiPixelCalZeroBias"
                   }
 
+# AlCaReco matrix used in CMSSW releases in 2017
+AlCaRecoMatrix2017 = {"AlCaLumiPixels" : "AlCaPCCZeroBias+AlCaPCCRandom",
+                      "Charmonium"     : "TkAlJpsiMuMu",
+                      "Commissioning"  : "HcalCalIsoTrk+HcalCalIsolatedBunchSelector+TkAlMinBias+SiStripCalMinBias",
+                      "Cosmics"        : "TkAlCosmics0T+MuAlGlobalCosmics+DtCalibCosmics",
+                      "DoubleEG"       : "EcalCalZElectron+EcalUncalZElectron+HcalCalIterativePhiSym+HcalCalIsoTrkFilter",
+                      "DoubleMuon"     : "TkAlZMuMu+MuAlCalIsolatedMu+MuAlOverlaps+MuAlZMuMu+DtCalib",
+                      "HLTPhysics"     : "TkAlMinBias",
+                      "JetHT"          : "HcalCalIsoTrkFilter+HcalCalIsolatedBunchFilter",
+                      "MinimumBias"    : "SiStripCalZeroBias+SiStripCalMinBias+TkAlMinBias",
+                      "MuOnia"         : "TkAlUpsilonMuMu",
+                      "NoBPTX"         : "TkAlCosmicsInCollisions",
+                      "SingleElectron" : "EcalUncalWElectron+EcalUncalZElectron+HcalCalIterativePhiSym+EcalESAlign",
+                      "SingleMuon"     : "TkAlMuonIsolated+DtCalib+MuAlCalIsolatedMu+MuAlOverlaps+MuAlZMuMu+HcalCalHO+HcalCalIterativePhiSym+HcalCalHBHEMuonFilter",
+                      "SinglePhoton"   : "HcalCalGammaJet",
+                      "ZeroBias"       : "SiStripCalZeroBias+TkAlMinBias+LumiPixelsMinBias+SiStripCalMinBias+AlCaPCCZeroBiasFromRECO", 
+
+                      "Express"  : "SiStripCalZeroBias+TkAlMinBias+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAAG+DtCalib+Hotline+LumiPixelsMinBias+SiPixelCalZeroBias",
+                      "ExpressCosmics" : "SiStripPCLHistos+SiStripCalZeroBias+TkAlCosmics0T+DtCalibCosmics+SiPixelCalZeroBias",
+                      "ExpressAlignment":"TkAlMinBias",
+                      # These two cannot run on RAW, they are just meant to run on the dedicated AlcaRAW so they do not enter the allForPrompt list
+                      "AlCaPhiSym"     : "",
+                      "AlCaP0"         : "",
+                      # ---------------------------------------------------------------------------------------------------------------------------
+                      "HcalNZS"        : "HcalCalMinBias",
+                      # This is in the AlCaRecoMatrix, but no RelVals are produced
+                      # 'TestEnablesTracker'  : 'TkAlLAS'
+                      # 'TestEnablesEcalHcal' : 'HcalCalPedestal'
+                      "MET" : "HcalCalNoise",
+                      "SingleMu" : "MuAlCalIsolatedMu+MuAlOverlaps+TkAlMuonIsolated+DtCalib+MuAlZMuMu+HcalCalHO",
+                      "DoubleMu" : "MuAlCalIsolatedMu+MuAlOverlaps+DtCalib+TkAlZMuMu",
+                      "DoubleMuParked" : "MuAlCalIsolatedMu+MuAlOverlaps+DtCalib+TkAlZMuMu",
+                      "MuOniaParked" : "TkAlJpsiMuMu+TkAlUpsilonMuMu",
+                      "DoubleElectron" : "EcalCalZElectron+EcalUncalZElectron+HcalCalIsoTrkFilter",
+                      "StreamExpress" : "SiStripCalZeroBias+TkAlMinBias+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAAG+DtCalib+Hotline+LumiPixelsMinBias+SiPixelCalZeroBias",
+                      "StreamExpressHI" : "SiStripCalZeroBias+TkAlMinBiasHI+SiStripPCLHistos+SiStripCalMinBias+SiStripCalMinBiasAAG+DtCalibHI+SiPixelCalZeroBias"
+}
+
 # this matrix will be used for the legacy reprocessing of the 2016 2016B-H dataset;
 # with the exception of ZeroBias, it was also used for the 23Sept16 reprocessing of 2016B-G 
 AlCaRecoMatrixRereco = {'AlCaLumiPixels' : 'LumiPixels',