Skip to content

Commit 0afcc4f

Browse files
authored
Merge pull request cms-sw#42823 from kpedro88/cmsArgParseArgv
Fix usage of sys.argv in cmsRun configs
2 parents b38f64c + bb0a26c commit 0afcc4f

File tree

83 files changed

+171
-281
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+171
-281
lines changed

Alignment/MuonAlignment/python/convertXMLtoSQLite_cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929

3030
process.MuonGeometryDBConverter = cms.EDAnalyzer("MuonGeometryDBConverter",
3131
input = cms.string("xml"),
32-
fileName = cms.string(str(sys.argv[2])),
32+
fileName = cms.string(str(sys.argv[1])),
3333
shiftErr = cms.double(1000.),
3434
angleErr = cms.double(6.28),
3535
output = cms.string("db"))
3636

3737
process.load("CondCore.DBCommon.CondDBSetup_cfi")
3838
process.PoolDBOutputService = cms.Service("PoolDBOutputService",
3939
process.CondDBSetup,
40-
connect = cms.string("sqlite_file:"+str(sys.argv[2])[:-3]+"db"),
40+
connect = cms.string("sqlite_file:"+str(sys.argv[1])[:-3]+"db"),
4141
toPut = cms.VPSet(
4242
cms.PSet(record = cms.string("DTAlignmentRcd"), tag = cms.string("DTAlignmentRcd")),
4343
cms.PSet(record = cms.string("DTAlignmentErrorExtendedRcd"), tag = cms.string("DTAlignmentErrorExtendedRcd")),

CalibPPS/ESProducers/test/print_alignment_info_DB_cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import sys
55

6-
if len(sys.argv) >2:
7-
runno = int(sys.argv[2])
6+
if len(sys.argv) >1:
7+
runno = int(sys.argv[1])
88
else:
99
runno = 1
1010

CondTools/BTau/python/bTagCalibrationDbCreation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import sys
44
import FWCore.ParameterSet.Config as cms
55

6-
if len(sys.argv) < 3:
6+
if len(sys.argv) < 2:
77
raise RuntimeError('\nERROR: Need csv-filename as first argument.\n')
8-
csv_file = sys.argv[2]
8+
csv_file = sys.argv[1]
99
db_file = csv_file.replace('.csv', '.db')
1010
tagger = os.path.basename(csv_file).split('.')[0]
1111
print("Using file:", csv_file)

CondTools/CTPPS/test/retrieve-sqlite-rpalignment_cfg.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import FWCore.ParameterSet.Config as cms
22
import sys
33

4-
if len(sys.argv)>2:
5-
sqlitename =sys.argv[2]
4+
if len(sys.argv)>1:
5+
sqlitename =sys.argv[1]
66
else:
77
sqlitename = "CTPPSRPRealAlignment.db"
88

9-
if len(sys.argv) > 3:
10-
runno = int(sys.argv[3])
9+
if len(sys.argv) > 2:
10+
runno = int(sys.argv[2])
1111
else:
1212
runno=1
1313

14-
if len(sys.argv) >4 :
15-
tagname = sys.argv[4]
14+
if len(sys.argv) >3 :
15+
tagname = sys.argv[3]
1616
else:
1717
tagname="CTPPSRPAlignment_real"
1818

19-
if len(sys.argv) > 5:
20-
rcdname=sys.argv[5]
19+
if len(sys.argv) > 4:
20+
rcdname=sys.argv[4]
2121
else:
2222
rcdname="RPRealAlignmentRecord"
2323

CondTools/CTPPS/test/write-ctpps-rprealalignment_singletest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
process = cms.Process('test')
44

55
import sys
6-
if len(sys.argv)>2:
7-
startrun = int(sys.argv[2])
6+
if len(sys.argv)>1:
7+
startrun = int(sys.argv[1])
88
else:
99
startrun = 1
1010
process.source = cms.Source("EmptyIOVSource",

CondTools/CTPPS/test/write-ctpps-rprealalignment_table_cfg.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
process = cms.Process('test')
55

66
import sys
7-
if len(sys.argv) > 3:
8-
startrun = sys.argv[2]
9-
subdir = sys.argv[3]+"/"
7+
if len(sys.argv) > 2:
8+
startrun = sys.argv[1]
9+
subdir = sys.argv[2]+"/"
1010
else:
1111
print("not able to run")
1212
exit()

CondTools/CTPPS/test/write-ctpps-rprealalignment_table_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
process = cms.Process('test')
55

66
# import sys
7-
# if len(sys.argv) > 3:
8-
# startrun = sys.argv[2]
9-
# path = sys.argv[3]+"/"
7+
# if len(sys.argv) > 2:
8+
# startrun = sys.argv[1]
9+
# path = sys.argv[2]+"/"
1010
# else:
1111
# print("not able to run")
1212
# exit()

CondTools/SiPixel/test/SiPixel2DTemplateDBObjectReader_cfg.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#process.load("CalibTracker.SiPixelESProducers.SiPixel2DTemplateDBObjectESProducer_cfi")
88

99
#magfield and version are argument #1 and #2
10-
#magfield = float(sys.argv[2])
11-
#version = sys.argv[3]
10+
#magfield = float(sys.argv[1])
11+
#version = sys.argv[2]
1212

1313
#magfield and version are hardcoded for the record
1414
magfield = 38

DPGAnalysis/HcalTools/python/remoteMonitoring_LASER_era2018_cfg.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
process.load('Configuration.StandardSequences.GeometryRecoDB_cff')
2424
process.load('Configuration.StandardSequences.EndOfProcess_cff')
2525

26-
##runnumber = sys.argv[2][4:-5]
27-
runnumber = sys.argv[2]
28-
rundir = sys.argv[3]
29-
histodir = sys.argv[4]
26+
runnumber = sys.argv[1]
27+
rundir = sys.argv[2]
28+
histodir = sys.argv[3]
3029

3130
#print 'RUN = '+runnumber
3231
#print 'Input file = '+rundir+'/run'+runnumber+'/USC_'+runnumber+'.root'

DPGAnalysis/HcalTools/python/remoteMonitoring_LASER_era2019_cfg.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323
process.load('Configuration.StandardSequences.GeometryRecoDB_cff')
2424
process.load('Configuration.StandardSequences.EndOfProcess_cff')
2525

26-
##runnumber = sys.argv[2][4:-5]
27-
runnumber = sys.argv[2]
28-
rundir = sys.argv[3]
29-
histodir = sys.argv[4]
26+
runnumber = sys.argv[1]
27+
rundir = sys.argv[2]
28+
histodir = sys.argv[3]
3029

3130
#print 'RUN = '+runnumber
3231
#print 'Input file = '+rundir+'/run'+runnumber+'/USC_'+runnumber+'.root'

0 commit comments

Comments
 (0)