Switch the 'old' 2017 tracking back to default, and CA seeding to the…

… special workflows

Configuration/Eras/python/Era_Run2_2017_cff.py

@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.Eras.ModifierChain_run2_2017_core_cff import run2_2017_core
-from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+from Configuration.Eras.Modifier_trackingPhase1QuadProp_cff import trackingPhase1QuadProp
 
-Run2_2017 = cms.ModifierChain(run2_2017_core, trackingPhase1)
+Run2_2017 = cms.ModifierChain(run2_2017_core, trackingPhase1QuadProp)
 

Configuration/Eras/python/Era_Run2_2017_trackingPhase1CA_cff.py

@@ -0,0 +1,6 @@
+import FWCore.ParameterSet.Config as cms
+
+from Configuration.Eras.ModifierChain_run2_2017_core_cff import run2_2017_core
+from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
+
+Run2_2017_trackingPhase1CA = cms.ModifierChain(run2_2017_core, trackingPhase1)

Configuration/PyReleaseValidation/python/relval_2017.py

@@ -53,15 +53,15 @@ def _trackingRun2(stepList):
             continue
         res.append(s)
     return res
-def _trackingPhase1QuadProp(stepList):
+def _trackingPhase1CA(stepList):
     res = []
     for step in stepList:
         s = step
         if 'RecoFull' in step:
             if 'trackingOnly' in step:
-                s = s.replace('Only', 'OnlyPhase1QuadProp')
+                s = s.replace('Only', 'OnlyPhase1CA')
             else:
-                s = s.replace('Full', 'Full_trackingPhase1QuadProp')
+                s = s.replace('Full', 'Full_trackingPhase1CA')
         if 'ALCA' in s:
             continue
         res.append(s)
@@ -73,5 +73,5 @@ def _trackingPhase1QuadProp(stepList):
 workflows[10024.1] = [ workflows[10024.0][0], _trackingOnly(workflows[10024.0][1]) ]
 workflows[10024.2] = [ workflows[10024.0][0], _trackingRun2(workflows[10024.0][1]) ]
 workflows[10024.3] = [ workflows[10024.1][0], _trackingRun2(workflows[10024.1][1]) ]
-workflows[10024.4] = [ workflows[10024.0][0], _trackingPhase1QuadProp(workflows[10024.0][1]) ]
-workflows[10024.5] = [ workflows[10024.1][0], _trackingPhase1QuadProp(workflows[10024.1][1]) ]
+workflows[10024.4] = [ workflows[10024.0][0], _trackingPhase1CA(workflows[10024.0][1]) ]
+workflows[10024.5] = [ workflows[10024.1][0], _trackingPhase1CA(workflows[10024.1][1]) ]

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -1937,5 +1937,5 @@ def lhegensim(fragment,howMuch):
 # 2017 tracking specific eras
 steps['RecoFull_trackingRun2_2017'] = merge([{'--era': 'Run2_2017_trackingRun2'}, steps['RecoFull_2017']])
 steps['RecoFull_trackingOnlyRun2_2017'] = merge([{'--era': 'Run2_2017_trackingRun2'}, steps['RecoFull_trackingOnly_2017']])
-steps['RecoFull_trackingPhase1QuadProp_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1QuadProp'}, steps['RecoFull_2017']])
-steps['RecoFull_trackingOnlyPhase1QuadProp_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1QuadProp'}, steps['RecoFull_trackingOnly_2017']])
+steps['RecoFull_trackingPhase1CA_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1CA'}, steps['RecoFull_2017']])
+steps['RecoFull_trackingOnlyPhase1CA_2017'] = merge([{'--era': 'Run2_2017_trackingPhase1CA'}, steps['RecoFull_trackingOnly_2017']])

Configuration/StandardSequences/python/Eras.py

@@ -21,7 +21,7 @@ def __init__(self):
                  'Run2_2016_pA',
                  'Run2_2017',
                  'Run2_2017_trackingRun2',
-                 'Run2_2017_trackingPhase1QuadProp',
+                 'Run2_2017_trackingPhase1CA',
                  'Run3',
                  'Phase2C1',
                  'Phase2C2',