Skip to content

Commit 9025113

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47366 from bsunanda/Run3-gex187C
Run3-gex187C Update the scripts for the years 2021, 2023, 2024, 2026 which are used to prepare the payloads from DDD versions
2 parents 689a5c3 + 37571f8 commit 9025113

11 files changed

+394
-324
lines changed

‎CondTools/Geometry/test/writehelpers/createExtended2021Payloads.sh‎

Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
2+
function die { echo $1: status $2 ; exit $2; }
33

44
if [ $# -ne 1 ]
55
then
@@ -10,84 +10,79 @@ mytag=$1
1010
echo ${mytag}
1111

1212
# Set the tag in all the scripts and the metadata text files
13-
sed -i {s/TagXX/${mytag}/g} *.py
13+
#sed -i {s/TagXX/${mytag}/g} *.py
1414
compgen -G "*.txt" > /dev/null && sed -i {s/TagXX/${mytag}/g} *.txt
1515
sed -i {s/TagXX/${mytag}/g} splitExtended2021Database.sh
1616

1717
# First read in the little XML files and create the
18-
# large XML file for the Phase1_R30F12_HCal Ideal scenario.
19-
# Input cff Output file
20-
# GeometryExtended2021_cff geSingleBigFile.xml
21-
cmsRun geometryExtended2021_xmlwriter.py
18+
# big XML file for the Extended2021 scenario.
19+
cmsRun geometryExtended2021_xmlwriter.py || die 'failed geometryExtended2021_xmlwriter.py' $?
2220

2321
# Now convert the content of the large XML file into
2422
# a "blob" and write it to the database.
2523
# Also reads in the little XML files again and fills
2624
# the DDCompactView. From the DDCompactView the
2725
# reco parts of the database are also filled.
28-
cmsRun geometryExtended2021_writer.py
26+
cmsRun geometryExtended2021_writer.py --tag=${mytag} || die 'failed geometryExtended2021_writer.py' $?
2927

3028
# Now put the other scenarios into the database.
3129
# Input the many XML files referenced by the cff file and
3230
# output a single big XML file.
3331
# This is repeated several times below. The sed commands
34-
# serve to give the following sequence of input and output
32+
# serve to give the correct sequence of input and output
3533
# files
36-
#
37-
# Input cff Output file
38-
# GeometryIdeal_cff giSingleBigFile.xml
39-
#
40-
sed -i '{s/Extended2021/Extended2021ZeroMaterial/g}' geometryExtended2021_xmlwriter.py
41-
sed -i '{s/\/ge/\/gez/g}' geometryExtended2021_xmlwriter.py
42-
cmsRun geometryExtended2021_xmlwriter.py
43-
44-
sed -i '{s/Extended2021ZeroMaterial/Extended2021FlatMinus05Percent/g}' geometryExtended2021_xmlwriter.py
45-
sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2021_xmlwriter.py
46-
cmsRun geometryExtended2021_xmlwriter.py
47-
48-
sed -i '{s/Extended2021FlatMinus05Percent/Extended2021FlatMinus10Percent/g}' geometryExtended2021_xmlwriter.py
49-
sed -i '{s/\/geFM05/\/geFM10/g}' geometryExtended2021_xmlwriter.py
50-
cmsRun geometryExtended2021_xmlwriter.py
51-
52-
sed -i '{s/Extended2021FlatMinus10Percent/Extended2021FlatPlus05Percent/g}' geometryExtended2021_xmlwriter.py
53-
sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2021_xmlwriter.py
54-
cmsRun geometryExtended2021_xmlwriter.py
55-
56-
sed -i '{s/Extended2021FlatPlus05Percent/Extended2021FlatPlus10Percent/g}' geometryExtended2021_xmlwriter.py
57-
sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2021_xmlwriter.py
58-
cmsRun geometryExtended2021_xmlwriter.py
34+
35+
#sed -i '{s/Extended2021/Extended2021ZeroMaterial/g}' geometryExtended2021_xmlwriter.py
36+
#sed -i '{s/\/ge/\/gez/g}' geometryExtended2021_xmlwriter.py
37+
cmsRun geometryExtended2021_xmlwriter.py --geom=Extended2021ZeroMaterial --out=gez || die 'failed geometryExtended2021_xmlwriter.py Extended2021ZeroMaterial' $?
38+
39+
#sed -i '{s/Extended2021ZeroMaterial/Extended2021FlatMinus05Percent/g}' geometryExtended2021_xmlwriter.py
40+
#sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2021_xmlwriter.py
41+
cmsRun geometryExtended2021_xmlwriter.py --geom=Extended2021FlatMinus05Percent --out=geFM05 || die 'failed geometryExtended2021_xmlwriter.py Extended2021FlatMinus05Percent' $?
42+
43+
#sed -i '{s/Extended2021FlatMinus05Percent/Extended2021FlatMinus10Percent/g}' geometryExtended2021_xmlwriter.py
44+
#sed -i '{s/\/geFM05/\/geFM10/g}' geometryExtended2021_xmlwriter.py
45+
cmsRun geometryExtended2021_xmlwriter.py --geom=Extended2021FlatMinus10Percent --out=geFM10 || die 'failed geometryExtended2021_xmlwriter.py' $?
46+
47+
#sed -i '{s/Extended2021FlatMinus10Percent/Extended2021FlatPlus05Percent/g}' geometryExtended2021_xmlwriter.py
48+
#sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2021_xmlwriter.py
49+
cmsRun geometryExtended2021_xmlwriter.py --geom=Extended2021FlatPlus05Percent --out=geFP05 || die 'failed geometryExtended2021_xmlwriter.py Extended2021FlatPlus05Percent' $?
50+
51+
#sed -i '{s/Extended2021FlatPlus05Percent/Extended2021FlatPlus10Percent/g}' geometryExtended2021_xmlwriter.py
52+
#sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2021_xmlwriter.py
53+
cmsRun geometryExtended2021_xmlwriter.py --geom=Extended2021FlatPlus10Percent --out=geFP10 || die 'failed geometryExtended2021_xmlwriter.py' $?
5954

6055
# Read the one big XML file and output a record to the
6156
# database with the an identifying tag
6257
# This is repeated several times below. The sed commands
63-
# serve to give the following sequence of input file and output
58+
# serve to give the correct sequence of input file and output
6459
# tag
65-
#
60+
# To start:
6661
# Input file Output tag
6762
# gezSingleBigFile.xml XMLFILE_Geometry_${mytag}_Extended2021ZeroMaterial_mc
68-
#
69-
sed -i '{s/Extended/Extended2021ZeroMaterial/g}' xmlgeometrywriter.py
70-
sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
71-
cmsRun xmlgeometrywriter.py
7263

73-
sed -i '{s/Extended2021ZeroMaterial/Extended2021FlatMinus05Percent/g}' xmlgeometrywriter.py
74-
sed -i '{s/\/gez/\/geFM05/g}' xmlgeometrywriter.py
75-
cmsRun xmlgeometrywriter.py
64+
#sed -i '{s/Extended/Extended2021ZeroMaterial/g}' xmlgeometrywriter.py
65+
#sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
66+
cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2021ZeroMaterial --inPre=gez|| die 'failed xmlgeometrywriter.py Extended2021ZeroMaterial' $?
67+
68+
#sed -i '{s/Extended2021ZeroMaterial/Extended2021FlatMinus05Percent/g}' xmlgeometrywriter.py
69+
#sed -i '{s/\/gez/\/geFM05/g}' xmlgeometrywriter.py
70+
cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2021FlatMinus05Percent --inPre=geFM05 || die 'failed xmlgeometrywriter.py Extended2021FlatMinus05Percent' $?
7671

77-
sed -i '{s/Extended2021FlatMinus05Percent/Extended2021FlatMinus10Percent/g}' xmlgeometrywriter.py
78-
sed -i '{s/\/geFM05/\/geFM10/g}' xmlgeometrywriter.py
79-
cmsRun xmlgeometrywriter.py
72+
#sed -i '{s/Extended2021FlatMinus05Percent/Extended2021FlatMinus10Percent/g}' xmlgeometrywriter.py
73+
#sed -i '{s/\/geFM05/\/geFM10/g}' xmlgeometrywriter.py
74+
cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2021FlatMinus10Percent --inPre=geFM10 || die 'failed xmlgeometrywriter.py Extended2021FlatMinus10Percent' $?
8075

81-
sed -i '{s/Extended2021FlatMinus10Percent/Extended2021FlatPlus05Percent/g}' xmlgeometrywriter.py
82-
sed -i '{s/\/geFM10/\/geFP05/g}' xmlgeometrywriter.py
83-
cmsRun xmlgeometrywriter.py
76+
#sed -i '{s/Extended2021FlatMinus10Percent/Extended2021FlatPlus05Percent/g}' xmlgeometrywriter.py
77+
#sed -i '{s/\/geFM10/\/geFP05/g}' xmlgeometrywriter.py
78+
cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2021FlatPlus05Percent --inPre=geFP05 || die 'failed xmlgeometrywriter.py Extended2021FlatPlus05Percent' $?
8479

85-
sed -i '{s/Extended2021FlatPlus05Percent/Extended2021FlatPlus10Percent/g}' xmlgeometrywriter.py
86-
sed -i '{s/\/geFP05/\/geFP10/g}' xmlgeometrywriter.py
87-
cmsRun xmlgeometrywriter.py
80+
#sed -i '{s/Extended2021FlatPlus05Percent/Extended2021FlatPlus10Percent/g}' xmlgeometrywriter.py
81+
#sed -i '{s/\/geFP05/\/geFP10/g}' xmlgeometrywriter.py
82+
cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2021FlatPlus10Percent --inPre=geFP10 || die 'failed xmlgeometrywriter.py Extended2021FlatPlus10Percent' $?
8883

8984
# All the database objects were written into one database
9085
# (myfile.db) in the steps above. Extract the different
9186
# pieces into separate database files. These are the payloads
92-
# that get uploaded to the dropbox. There is one for each tag
87+
# that get uploaded to the DB. There is one for each tag
9388
./splitExtended2021Database.sh

‎CondTools/Geometry/test/writehelpers/createExtended2023Payloads.sh‎

Lines changed: 45 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
2-
2+
function die { echo $1: status $2 ; exit $2; }
33

44
if [ $# -ne 1 ]
55
then
@@ -10,84 +10,79 @@ mytag=$1
1010
echo ${mytag}
1111

1212
# Set the tag in all the scripts and the metadata text files
13-
sed -i {s/TagXX/${mytag}/g} *.py
13+
#sed -i {s/TagXX/${mytag}/g} *.py
1414
compgen -G "*.txt" > /dev/null && sed -i {s/TagXX/${mytag}/g} *.txt
1515
sed -i {s/TagXX/${mytag}/g} splitExtended2023Database.sh
1616

1717
# First read in the little XML files and create the
18-
# large XML file for the Phase1_R30F12_HCal Ideal scenario.
19-
# Input cff Output file
20-
# GeometryExtended2023_cff geSingleBigFile.xml
21-
cmsRun geometryExtended2023_xmlwriter.py
18+
# big XML file for the Extended2023 scenario.
19+
cmsRun geometryExtended2023_xmlwriter.py || die 'failed geometryExtended2023_xmlwriter.py' $?
2220

2321
# Now convert the content of the large XML file into
2422
# a "blob" and write it to the database.
2523
# Also reads in the little XML files again and fills
2624
# the DDCompactView. From the DDCompactView the
2725
# reco parts of the database are also filled.
28-
cmsRun geometryExtended2023_writer.py
26+
cmsRun geometryExtended2023_writer.py --tag=${mytag} || die 'failed geometryExtended2023_writer.py' $?
2927

3028
# Now put the other scenarios into the database.
3129
# Input the many XML files referenced by the cff file and
3230
# output a single big XML file.
3331
# This is repeated several times below. The sed commands
34-
# serve to give the following sequence of input and output
32+
# serve to give the correct sequence of input and output
3533
# files
36-
#
37-
# Input cff Output file
38-
# GeometryIdeal_cff giSingleBigFile.xml
39-
#
40-
sed -i '{s/Extended2023/Extended2023ZeroMaterial/g}' geometryExtended2023_xmlwriter.py
41-
sed -i '{s/\/ge/\/gez/g}' geometryExtended2023_xmlwriter.py
42-
cmsRun geometryExtended2023_xmlwriter.py
43-
44-
sed -i '{s/Extended2023ZeroMaterial/Extended2023FlatMinus05Percent/g}' geometryExtended2023_xmlwriter.py
45-
sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2023_xmlwriter.py
46-
cmsRun geometryExtended2023_xmlwriter.py
47-
48-
sed -i '{s/Extended2023FlatMinus05Percent/Extended2023FlatMinus10Percent/g}' geometryExtended2023_xmlwriter.py
49-
sed -i '{s/\/geFM05/\/geFM10/g}' geometryExtended2023_xmlwriter.py
50-
cmsRun geometryExtended2023_xmlwriter.py
51-
52-
sed -i '{s/Extended2023FlatMinus10Percent/Extended2023FlatPlus05Percent/g}' geometryExtended2023_xmlwriter.py
53-
sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2023_xmlwriter.py
54-
cmsRun geometryExtended2023_xmlwriter.py
55-
56-
sed -i '{s/Extended2023FlatPlus05Percent/Extended2023FlatPlus10Percent/g}' geometryExtended2023_xmlwriter.py
57-
sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2023_xmlwriter.py
58-
cmsRun geometryExtended2023_xmlwriter.py
34+
35+
#sed -i '{s/Extended2023/Extended2023ZeroMaterial/g}' geometryExtended2023_xmlwriter.py
36+
#sed -i '{s/\/ge/\/gez/g}' geometryExtended2023_xmlwriter.py
37+
cmsRun geometryExtended2023_xmlwriter.py --geom=Extended2023ZeroMaterial --out=gez || die 'failed geometryExtended2023_xmlwriter.py Extended2023ZeroMaterial' $?
38+
39+
#sed -i '{s/Extended2023ZeroMaterial/Extended2023FlatMinus05Percent/g}' geometryExtended2023_xmlwriter.py
40+
#sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2023_xmlwriter.py
41+
cmsRun geometryExtended2023_xmlwriter.py --geom=Extended2023FlatMinus05Percent --out=geFM05 || die 'failed geometryExtended2023_xmlwriter.py Extended2023FlatMinus05Percent' $?
42+
43+
#sed -i '{s/Extended2023FlatMinus05Percent/Extended2023FlatMinus10Percent/g}' geometryExtended2023_xmlwriter.py
44+
#sed -i '{s/\/geFM05/\/geFM10/g}' geometryExtended2023_xmlwriter.py
45+
cmsRun geometryExtended2023_xmlwriter.py --geom=Extended2023FlatMinus10Percent --out=geFM10 || die 'failed geometryExtended2023_xmlwriter.py' $?
46+
47+
#sed -i '{s/Extended2023FlatMinus10Percent/Extended2023FlatPlus05Percent/g}' geometryExtended2023_xmlwriter.py
48+
#sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2023_xmlwriter.py
49+
cmsRun geometryExtended2023_xmlwriter.py --geom=Extended2023FlatPlus05Percent --out=geFP05 || die 'failed geometryExtended2023_xmlwriter.py Extended2023FlatPlus05Percent' $?
50+
51+
#sed -i '{s/Extended2023FlatPlus05Percent/Extended2023FlatPlus10Percent/g}' geometryExtended2023_xmlwriter.py
52+
#sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2023_xmlwriter.py
53+
cmsRun geometryExtended2023_xmlwriter.py --geom=Extended2023FlatPlus10Percent --out=geFP10 || die 'failed geometryExtended2023_xmlwriter.py' $?
5954

6055
# Read the one big XML file and output a record to the
6156
# database with the an identifying tag
6257
# This is repeated several times below. The sed commands
63-
# serve to give the following sequence of input file and output
58+
# serve to give the correct sequence of input file and output
6459
# tag
65-
#
60+
# To start:
6661
# Input file Output tag
6762
# gezSingleBigFile.xml XMLFILE_Geometry_${mytag}_Extended2023ZeroMaterial_mc
68-
#
69-
sed -i '{s/Extended/Extended2023ZeroMaterial/g}' xmlgeometrywriter.py
70-
sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
71-
cmsRun xmlgeometrywriter.py
7263

73-
sed -i '{s/Extended2023ZeroMaterial/Extended2023FlatMinus05Percent/g}' xmlgeometrywriter.py
74-
sed -i '{s/\/gez/\/geFM05/g}' xmlgeometrywriter.py
75-
cmsRun xmlgeometrywriter.py
64+
#sed -i '{s/Extended/Extended2023ZeroMaterial/g}' xmlgeometrywriter.py
65+
#sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
66+
cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2023ZeroMaterial --inPre=gez|| die 'failed xmlgeometrywriter.py Extended2023ZeroMaterial' $?
67+
68+
#sed -i '{s/Extended2023ZeroMaterial/Extended2023FlatMinus05Percent/g}' xmlgeometrywriter.py
69+
#sed -i '{s/\/gez/\/geFM05/g}' xmlgeometrywriter.py
70+
cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2023FlatMinus05Percent --inPre=geFM05 || die 'failed xmlgeometrywriter.py Extended2023FlatMinus05Percent' $?
7671

77-
sed -i '{s/Extended2023FlatMinus05Percent/Extended2023FlatMinus10Percent/g}' xmlgeometrywriter.py
78-
sed -i '{s/\/geFM05/\/geFM10/g}' xmlgeometrywriter.py
79-
cmsRun xmlgeometrywriter.py
72+
#sed -i '{s/Extended2023FlatMinus05Percent/Extended2023FlatMinus10Percent/g}' xmlgeometrywriter.py
73+
#sed -i '{s/\/geFM05/\/geFM10/g}' xmlgeometrywriter.py
74+
cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2023FlatMinus10Percent --inPre=geFM10 || die 'failed xmlgeometrywriter.py Extended2023FlatMinus10Percent' $?
8075

81-
sed -i '{s/Extended2023FlatMinus10Percent/Extended2023FlatPlus05Percent/g}' xmlgeometrywriter.py
82-
sed -i '{s/\/geFM10/\/geFP05/g}' xmlgeometrywriter.py
83-
cmsRun xmlgeometrywriter.py
76+
#sed -i '{s/Extended2023FlatMinus10Percent/Extended2023FlatPlus05Percent/g}' xmlgeometrywriter.py
77+
#sed -i '{s/\/geFM10/\/geFP05/g}' xmlgeometrywriter.py
78+
cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2023FlatPlus05Percent --inPre=geFP05 || die 'failed xmlgeometrywriter.py Extended2023FlatPlus05Percent' $?
8479

85-
sed -i '{s/Extended2023FlatPlus05Percent/Extended2023FlatPlus10Percent/g}' xmlgeometrywriter.py
86-
sed -i '{s/\/geFP05/\/geFP10/g}' xmlgeometrywriter.py
87-
cmsRun xmlgeometrywriter.py
80+
#sed -i '{s/Extended2023FlatPlus05Percent/Extended2023FlatPlus10Percent/g}' xmlgeometrywriter.py
81+
#sed -i '{s/\/geFP05/\/geFP10/g}' xmlgeometrywriter.py
82+
cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2023FlatPlus10Percent --inPre=geFP10 || die 'failed xmlgeometrywriter.py Extended2023FlatPlus10Percent' $?
8883

8984
# All the database objects were written into one database
9085
# (myfile.db) in the steps above. Extract the different
9186
# pieces into separate database files. These are the payloads
92-
# that get uploaded to the dropbox. There is one for each tag
87+
# that get uploaded to the DB. There is one for each tag
9388
./splitExtended2023Database.sh

0 commit comments

Comments
 (0)