diff --git a/RecoLuminosity/LumiDB/python/csvLumibyLSParser.py b/RecoLuminosity/LumiDB/python/csvLumibyLSParser.py index 7087fdf3d12c8..f03c9331c3536 100755 --- a/RecoLuminosity/LumiDB/python/csvLumibyLSParser.py +++ b/RecoLuminosity/LumiDB/python/csvLumibyLSParser.py @@ -10,10 +10,11 @@ def is_intstr(s): except ValueError: return False class csvLumibyLSParser(object): - def __init__(self,filename): + def __init__(self,filename,RunX): self.__result={} self.__strresult={} self.__filename=filename + self.__RunX=RunX csvReader=csv.reader(open(filename),delimiter=',') oldRun=0 runnumber=0 @@ -47,7 +48,10 @@ def __init__(self,filename): oldRun = runnumber try: - delivered, recorded = float( row[5] ), float( row[6] ) + if RunX=='Run2': + delivered, recorded = float( row[4] ), float( row[5] ) + if RunX=='Run1': + delivered, recorded = float( row[5] ), float( row[6] ) except: print 'Record not parsed, Run = %d, LS = %d' % (runnumber, lsnumber) diff --git a/RecoLuminosity/LumiDB/scripts/pileupReCalc_HLTpaths.py b/RecoLuminosity/LumiDB/scripts/pileupReCalc_HLTpaths.py index f6ac3951d98da..fe2045586f72d 100755 --- a/RecoLuminosity/LumiDB/scripts/pileupReCalc_HLTpaths.py +++ b/RecoLuminosity/LumiDB/scripts/pileupReCalc_HLTpaths.py @@ -54,7 +54,7 @@ def parseInputFile(inputfilename): parser.add_option('--inputLumiJSON',dest='inputLumiJSON',action='store', help='Input Lumi/Pileup file in JSON format (required)') parser.add_option('--verbose',dest='verbose',action='store_true',help='verbose mode for printing' ) - + parser.add_option('--runperiod',dest='runperiod',action='store', default='Run1',help='select runperiod Run1 or Run2, default Run1' ) # parse arguments try: (options, args) = parser.parse_args() @@ -75,10 +75,11 @@ def parseInputFile(inputfilename): print '\toutputfile: ',options.outputfile print '\tinput selection file: ',options.inputfile - + #print options.runperiod #inpf = open (options.inputfile, 'r') #inputfilecontent = inpf.read() - inputRange = csvLumibyLSParser.csvLumibyLSParser (options.inputfile).runsandls() + + inputRange = csvLumibyLSParser.csvLumibyLSParser (options.inputfile,options.runperiod).runsandls() #print 'number of runs processed %d' % csvLumibyLSParser.csvLumibyLSParser (options.inputfile).numruns()