Merge pull request cms-sw#2619 from franzoni/from-CMSSW_7_1_0_pre3_revertDQMIO_HIrecycle

Operations -- option in the matrix --revertDqmio  and HI min bias 2k

Author: ktf

Configuration/PyReleaseValidation/python/MatrixReader.py

@@ -20,6 +20,7 @@ def __init__(self, opt):
         self.reset(opt.what)
 
         self.wm=opt.wmcontrol
+        self.revertDqmio=opt.revertDqmio
         self.addCommand=opt.command
         self.apply=opt.apply
         self.commandLineWf=opt.workflow
@@ -243,8 +244,11 @@ def readMatrix(self, fileNameIn, useInput=None, refRel=None, fromScratch=None):
                         if self.apply:
                             if stepIndex in self.apply or stepName in self.apply:
                                 cmd +=' '+self.addCommand
-                        else:
-                            cmd +=' '+self.addCommand
+                            else:
+                                cmd +=' '+self.addCommand
+                    if self.wm and self.revertDqmio=='yes':
+                        cmd=cmd.replace('DQMROOT','DQM')
+                        cmd=cmd.replace('--filetype DQM','')
                 commands.append(cmd)
                 ranStepList.append(stepName)
                 stepIndex+=1
@@ -332,6 +336,8 @@ def showRaw(self, useInput, refRel=None, fromScratch=None, what='all',step1Only=
                     line += ' @@@'
                 else:
                     line += ' @@@ '+commands[0]
+                if self.revertDqmio=='yes':
+                    line=line.replace('DQMROOT','DQM')
                 writtenWF+=1
                 outFile.write(line+'\n')
 
@@ -344,6 +350,8 @@ def showRaw(self, useInput, refRel=None, fromScratch=None, what='all',step1Only=
                     stepIndex=index+1
                     if 'dasquery.log' in cmd: continue
                     line = 'STEP%d ++ '%(stepIndex,) +stepName + ' @@@ '+cmd
+                    if self.revertDqmio=='yes':
+                        line=line.replace('DQMROOT','DQM')
                     outFile.write(line+'\n')
                 outFile.write('\n'+'\n')
             outFile.close()

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -771,15 +771,15 @@ def gen2017(fragment,howMuch):
 steps['AMPT_PPb_5020GeV_MinimumBiasINPUT']={'INPUT':InputInfo(dataSet='/RelValAMPT_PPb_5020GeV_MinimumBias/%s/GEN-SIM'%(baseDataSetRelease[5],),location='STD')}
 
 ## heavy ions tests
-U500by1={'--relval': '500,1'}
+U2000by1={'--relval': '2000,1'}
 U80by1={'--relval': '80,1'}
 
 hiDefaults={'--conditions':'auto:starthi_HIon',
            '--scenario':'HeavyIons'}
 
-steps['HydjetQ_MinBias_2760GeV']=merge([{'-n':1},hiDefaults,genS('Hydjet_Quenched_MinBias_2760GeV_cfi',U500by1)])
+steps['HydjetQ_MinBias_2760GeV']=merge([{'-n':1},hiDefaults,genS('Hydjet_Quenched_MinBias_2760GeV_cfi',U2000by1)])
 steps['HydjetQ_MinBias_2760GeVINPUT']={'INPUT':InputInfo(dataSet='/RelValHydjetQ_MinBias_2760GeV/%s/GEN-SIM'%(baseDataSetRelease[1],),location='STD',split=5)}
-steps['HydjetQ_MinBias_2760GeV_UP15']=merge([{'-n':1},hiDefaults,genS('Hydjet_Quenched_MinBias_2760GeV_cfi',U500by1)])
+steps['HydjetQ_MinBias_2760GeV_UP15']=merge([{'-n':1},hiDefaults,genS('Hydjet_Quenched_MinBias_2760GeV_cfi',U2000by1)])
 steps['HydjetQ_MinBias_2760GeV_UP15INPUT']={'INPUT':InputInfo(dataSet='/RelValHydjetQ_MinBias_2760GeV/%s/GEN-SIM'%(baseDataSetRelease[1],),location='STD',split=5)}
 steps['HydjetQ_B0_2760GeV']=merge([{'-n':1},hiDefaults,genS('Hydjet_Quenched_B0_2760GeV_cfi',U80by1)])
 steps['HydjetQ_B0_2760GeVINPUT']={'INPUT':InputInfo(dataSet='/RelValHydjetQ_B0_2760GeV/%s/GEN-SIM'%(baseDataSetRelease[4],),location='STD')}

Configuration/PyReleaseValidation/scripts/runTheMatrix.py

@@ -132,6 +132,12 @@ def runSelected(opt):
                       dest='wmcontrol',
                       default=None,
                       )
+    parser.add_option('--revertDqmio',
+                      help='When submitting workflows to wmcontrol, force DQM outout to use pool and not DQMIO',
+                      choices=['yes','no'],
+                      dest='revertDqmio',
+                      default='no',
+                      )
     parser.add_option('--optionswm',
                       help='Specify a few things for wm injection',
                       default='',