don't merge - release used for CTD19

Configuration/ProcessModifiers/python/riemannFitGPU_cff.py → Configuration/ProcessModifiers/python/pixelNtupleFit_cff.py

@@ -1,5 +1,5 @@
 import FWCore.ParameterSet.Config as cms
 
-# This modifier is for replacing the default pixel track "fitting" with Riemann fit on GPU
+# This modifier is for replacing the default pixel track "fitting" with eihter Riemann or BrokenLine fit
 
-riemannFitGPU =  cms.Modifier()
+pixelNtupleFit =  cms.Modifier()

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -2047,11 +2047,8 @@ def gen2018HiMix(fragment,howMuch):
     '--datatier': 'GEN-SIM-RECO,DQMIO',
     '--eventcontent': 'RECOSIM,DQM',
 }
-step3_riemannFit = {
-    '--procModifiers': 'riemannFit',
-}
-step3_riemannFitGPU = {
-    '--procModifiers': 'riemannFitGPU',
+step3_pixelNtupleFit = {
+    '--procModifiers': 'pixelNtupleFit',
 }
 step3_gpu = {
     '--procModifiers': 'gpu',
@@ -3136,14 +3133,9 @@ def gen2018HiMix(fragment,howMuch):
         if 'Reco' in step: upgradeStepDict[stepName][k] = merge([step3_pixelTrackingOnly, upgradeStepDict[step][k]])
         elif 'HARVEST' in step: upgradeStepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'}, upgradeStepDict[step][k]])
 
-    for step in upgradeSteps['pixelTrackingOnlyRiemannFit']['steps']:
-        stepName = step + upgradeSteps['pixelTrackingOnlyRiemannFit']['suffix']
-        if 'Reco' in step: upgradeStepDict[stepName][k] = merge([step3_riemannFit, step3_pixelTrackingOnly, upgradeStepDict[step][k]])
-        elif 'HARVEST' in step: upgradeStepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'}, upgradeStepDict[step][k]])
-
-    for step in upgradeSteps['pixelTrackingOnlyRiemannFitGPU']['steps']:
-        stepName = step + upgradeSteps['pixelTrackingOnlyRiemannFitGPU']['suffix']
-        if 'Reco' in step: upgradeStepDict[stepName][k] = merge([step3_riemannFitGPU, step3_pixelTrackingOnly, upgradeStepDict[step][k]])
+    for step in upgradeSteps['pixelTrackingOnlyNtupleFit']['steps']:
+        stepName = step + upgradeSteps['pixelTrackingOnlyNtupleFit']['suffix']
+        if 'Reco' in step: upgradeStepDict[stepName][k] = merge([step3_pixelNtupleFit, step3_pixelTrackingOnly, upgradeStepDict[step][k]])
         elif 'HARVEST' in step: upgradeStepDict[stepName][k] = merge([{'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'}, upgradeStepDict[step][k]])
 
     for step in upgradeSteps['pixelTrackingOnlyGPU']['steps']:

Configuration/PyReleaseValidation/python/relval_upgrade.py

@@ -79,7 +79,7 @@ def makeStepName(key,frag,step,suffix):
             # special workflows for tracker
             if (upgradeDatasetFromFragment[frag]=="TTbar_13" or upgradeDatasetFromFragment[frag]=="TTbar_14TeV") and not 'PU' in key and hasHarvest:
                 # skip ALCA and Nano
-                trackingVariations = ['trackingOnly','trackingRun2','trackingOnlyRun2','trackingLowPU','pixelTrackingOnly','pixelTrackingOnlyRiemannFit','pixelTrackingOnlyRiemannFitGPU','pixelTrackingOnlyGPU']
+                trackingVariations = ['trackingOnly','trackingRun2','trackingOnlyRun2','trackingLowPU','pixelTrackingOnly','pixelTrackingOnlyNtupleFit','pixelTrackingOnlyGPU']
                 for tv in trackingVariations:
                     stepList[tv] = [s for s in stepList[tv] if (("ALCA" not in s) and ("Nano" not in s))]
                 workflows[numWF+upgradeSteps['trackingOnly']['offset']] = [ upgradeDatasetFromFragment[frag], stepList['trackingOnly']]

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -158,15 +158,15 @@
     'suffix' : '_pixelTrackingOnly',
     'offset' : 0.5,
 }
-upgradeSteps['pixelTrackingOnlyRiemannFit'] = {
+upgradeSteps['pixelTrackingOnlyNtupleFit'] = {
     'steps' : [
         'RecoFull',
         'HARVESTFull',
         'RecoFullGlobal',
         'HARVESTFullGlobal',
     ],
     'PU' : [],
-    'suffix' : '_pixelTrackingOnlyRiemannFit',
+    'suffix' : '_pixelTrackingOnlyNtupleFit',
     'offset' : 0.51,
 }
 upgradeSteps['pixelTrackingOnlyGPU'] = {
@@ -180,17 +180,6 @@
     'suffix' : '_pixelTrackingOnlyGPU',
     'offset' : 0.52,
 }
-upgradeSteps['pixelTrackingOnlyRiemannFitGPU'] = {
-    'steps' : [
-        'RecoFull',
-        'HARVESTFull',
-        'RecoFullGlobal',
-        'HARVESTFullGlobal',
-    ],
-    'PU' : [],
-    'suffix' : '_pixelTrackingOnlyRiemannFitGPU',
-    'offset' : 0.53,
-}
 upgradeSteps['Timing'] = {
     'steps' : upgradeSteps['baseline']['steps'],
     'PU' : upgradeSteps['baseline']['PU'],

DataFormats/Math/BuildFile.xml

@@ -1,5 +1,6 @@
 <use   name="DataFormats/Common"/>
 <use   name="rootmath"/>
+<use   name="eigen"/>
 
 <export>
   <lib   name="1"/>