Skip to content

Commit 69407d5

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47247 from bsunanda/Run3-gex187Y
Run3-gex187Y Update some of the scripts for 2021 and 2023 to make the payloads
2 parents fd5b22e + 63ea2e3 commit 69407d5

File tree

6 files changed

+142
-104
lines changed

6 files changed

+142
-104
lines changed

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

Lines changed: 34 additions & 34 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,20 +10,20 @@ 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
1818
# big XML file for the Extended2021DD4hep scenario.
19-
cmsRun geometryExtended2021DD4hep_xmlwriter.py
19+
cmsRun geometryExtended2021DD4hep_xmlwriter.py || die 'failed geometryExtended2021DD4hep_xmlwriter.py' $?
2020

2121
# Now convert the content of the large XML file into
2222
# a "blob" and write it to the database.
2323
# Also reads in the little XML files again and fills
2424
# the DDCompactView. From the DDCompactView the
2525
# reco parts of the database are also filled.
26-
cmsRun geometryExtended2021DD4hep_writer.py
26+
cmsRun geometryExtended2021DD4hep_writer.py --tag=${mytag} || die 'failed geometryExtended2021DD4hep_writer.py' $?
2727

2828
# Now put the other scenarios into the database.
2929
# Input the many XML files referenced by the cff file and
@@ -32,25 +32,25 @@ cmsRun geometryExtended2021DD4hep_writer.py
3232
# serve to give the correct sequence of input and output
3333
# files
3434

35-
sed -i '{s/ExtendedGeometry2021/ExtendedGeometry2021ZeroMaterial/g}' geometryExtended2021DD4hep_xmlwriter.py
36-
sed -i '{s/\/ge/\/gez/g}' geometryExtended2021DD4hep_xmlwriter.py
37-
cmsRun geometryExtended2021DD4hep_xmlwriter.py
35+
#sed -i '{s/ExtendedGeometry2021/ExtendedGeometry2021ZeroMaterial/g}' geometryExtended2021DD4hep_xmlwriter.py
36+
#sed -i '{s/\/ge/\/gez/g}' geometryExtended2021DD4hep_xmlwriter.py
37+
cmsRun geometryExtended2021DD4hep_xmlwriter.py --geom=ExtendedGeometry2021ZeroMaterial --out=gez || die 'failed geometryExtended2021DD4hep_xmlwriter.py ExtendedGeometry2021ZeroMaterial' $?
3838

39-
sed -i '{s/ExtendedGeometry2021ZeroMaterial/ExtendedGeometry2021FlatMinus05Percent/g}' geometryExtended2021DD4hep_xmlwriter.py
40-
sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2021DD4hep_xmlwriter.py
41-
cmsRun geometryExtended2021DD4hep_xmlwriter.py
39+
#sed -i '{s/ExtendedGeometry2021ZeroMaterial/ExtendedGeometry2021FlatMinus05Percent/g}' geometryExtended2021DD4hep_xmlwriter.py
40+
#sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2021DD4hep_xmlwriter.py
41+
cmsRun geometryExtended2021DD4hep_xmlwriter.py --geom=ExtendedGeometry2021FlatMinus05Percent --out=geFM05 || die 'failed geometryExtended2021DD4hep_xmlwriter.py ExtendedGeometry2021FlatMinus05Percent' $?
4242

43-
sed -i '{s/ExtendedGeometry2021FlatMinus05Percent/ExtendedGeometry2021FlatMinus10Percent/g}' geometryExtended2021DD4hep_xmlwriter.py
44-
sed -i '{s/\/geFM05/\/geFM10/g}' geometryExtended2021DD4hep_xmlwriter.py
45-
cmsRun geometryExtended2021DD4hep_xmlwriter.py
43+
#sed -i '{s/ExtendedGeometry2021FlatMinus05Percent/ExtendedGeometry2021FlatMinus10Percent/g}' geometryExtended2021DD4hep_xmlwriter.py
44+
#sed -i '{s/\/geFM05/\/geFM10/g}' geometryExtended2021DD4hep_xmlwriter.py
45+
cmsRun geometryExtended2021DD4hep_xmlwriter.py --geom=ExtendedGeometry2021FlatMinus10Percent --out=geFM10 || die 'failed geometryExtended2021DD4hep_xmlwriter.py' $?
4646

47-
sed -i '{s/ExtendedGeometry2021FlatMinus10Percent/ExtendedGeometry2021FlatPlus05Percent/g}' geometryExtended2021DD4hep_xmlwriter.py
48-
sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2021DD4hep_xmlwriter.py
49-
cmsRun geometryExtended2021DD4hep_xmlwriter.py
47+
#sed -i '{s/ExtendedGeometry2021FlatMinus10Percent/ExtendedGeometry2021FlatPlus05Percent/g}' geometryExtended2021DD4hep_xmlwriter.py
48+
#sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2021DD4hep_xmlwriter.py
49+
cmsRun geometryExtended2021DD4hep_xmlwriter.py --geom=ExtendedGeometry2021FlatPlus05Percent --out=geFP05 || die 'failed geometryExtended2021DD4hep_xmlwriter.py ExtendedGeometry2021FlatPlus05Percent' $?
5050

51-
sed -i '{s/ExtendedGeometry2021FlatPlus05Percent/ExtendedGeometry2021FlatPlus10Percent/g}' geometryExtended2021DD4hep_xmlwriter.py
52-
sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2021DD4hep_xmlwriter.py
53-
cmsRun geometryExtended2021DD4hep_xmlwriter.py
51+
#sed -i '{s/ExtendedGeometry2021FlatPlus05Percent/ExtendedGeometry2021FlatPlus10Percent/g}' geometryExtended2021DD4hep_xmlwriter.py
52+
#sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2021DD4hep_xmlwriter.py
53+
cmsRun geometryExtended2021DD4hep_xmlwriter.py --geom=ExtendedGeometry2021FlatPlus10Percent --out=geFP10 || die 'failed geometryExtended2021DD4hep_xmlwriter.py' $?
5454

5555
# Read the one big XML file and output a record to the
5656
# database with the an identifying tag
@@ -61,25 +61,25 @@ cmsRun geometryExtended2021DD4hep_xmlwriter.py
6161
# Input file Output tag
6262
# gezSingleBigFile.xml XMLFILE_Geometry_${mytag}_Extended2021ZeroMaterial_mc
6363

64-
sed -i '{s/Extended/Extended2021ZeroMaterial/g}' xmlgeometrywriter.py
65-
sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
66-
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' $?
6767

68-
sed -i '{s/Extended2021ZeroMaterial/Extended2021FlatMinus05Percent/g}' xmlgeometrywriter.py
69-
sed -i '{s/\/gez/\/geFM05/g}' xmlgeometrywriter.py
70-
cmsRun xmlgeometrywriter.py
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' $?
7171

72-
sed -i '{s/Extended2021FlatMinus05Percent/Extended2021FlatMinus10Percent/g}' xmlgeometrywriter.py
73-
sed -i '{s/\/geFM05/\/geFM10/g}' xmlgeometrywriter.py
74-
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' $?
7575

76-
sed -i '{s/Extended2021FlatMinus10Percent/Extended2021FlatPlus05Percent/g}' xmlgeometrywriter.py
77-
sed -i '{s/\/geFM10/\/geFP05/g}' xmlgeometrywriter.py
78-
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' $?
7979

80-
sed -i '{s/Extended2021FlatPlus05Percent/Extended2021FlatPlus10Percent/g}' xmlgeometrywriter.py
81-
sed -i '{s/\/geFP05/\/geFP10/g}' xmlgeometrywriter.py
82-
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' $?
8383

8484
# All the database objects were written into one database
8585
# (myfile.db) in the steps above. Extract the different

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

Lines changed: 34 additions & 34 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,20 +10,20 @@ 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
1818
# big XML file for the Extended2023DD4hep scenario.
19-
cmsRun geometryExtended2023DD4hep_xmlwriter.py
19+
cmsRun geometryExtended2023DD4hep_xmlwriter.py || die 'failed geometryExtended2023DD4hep_xmlwriter.py' $?
2020

2121
# Now convert the content of the large XML file into
2222
# a "blob" and write it to the database.
2323
# Also reads in the little XML files again and fills
2424
# the DDCompactView. From the DDCompactView the
2525
# reco parts of the database are also filled.
26-
cmsRun geometryExtended2023DD4hep_writer.py
26+
cmsRun geometryExtended2023DD4hep_writer.py --tag=${mytag} || die 'failed geometryExtended2023DD4hep_writer.py' $?
2727

2828
# Now put the other scenarios into the database.
2929
# Input the many XML files referenced by the cff file and
@@ -32,25 +32,25 @@ cmsRun geometryExtended2023DD4hep_writer.py
3232
# serve to give the correct sequence of input and output
3333
# files
3434

35-
sed -i '{s/ExtendedGeometry2023/ExtendedGeometry2023ZeroMaterial/g}' geometryExtended2023DD4hep_xmlwriter.py
36-
sed -i '{s/\/ge/\/gez/g}' geometryExtended2023DD4hep_xmlwriter.py
37-
cmsRun geometryExtended2023DD4hep_xmlwriter.py
35+
#sed -i '{s/ExtendedGeometry2023/ExtendedGeometry2023ZeroMaterial/g}' geometryExtended2023DD4hep_xmlwriter.py
36+
#sed -i '{s/\/ge/\/gez/g}' geometryExtended2023DD4hep_xmlwriter.py
37+
cmsRun geometryExtended2023DD4hep_xmlwriter.py --geom=ExtendedGeometry2023ZeroMaterial --out=gez || die 'failed geometryExtended2023DD4hep_xmlwriter.py ExtendedGeometry2023ZeroMaterial' $?
3838

39-
sed -i '{s/ExtendedGeometry2023ZeroMaterial/ExtendedGeometry2023FlatMinus05Percent/g}' geometryExtended2023DD4hep_xmlwriter.py
40-
sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2023DD4hep_xmlwriter.py
41-
cmsRun geometryExtended2023DD4hep_xmlwriter.py
39+
#sed -i '{s/ExtendedGeometry2023ZeroMaterial/ExtendedGeometry2023FlatMinus05Percent/g}' geometryExtended2023DD4hep_xmlwriter.py
40+
#sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2023DD4hep_xmlwriter.py
41+
cmsRun geometryExtended2023DD4hep_xmlwriter.py --geom=ExtendedGeometry2023FlatMinus05Percent --out=geFM05 || die 'failed geometryExtended2023DD4hep_xmlwriter.py ExtendedGeometry2023FlatMinus05Percent' $?
4242

43-
sed -i '{s/ExtendedGeometry2023FlatMinus05Percent/ExtendedGeometry2023FlatMinus10Percent/g}' geometryExtended2023DD4hep_xmlwriter.py
44-
sed -i '{s/\/geFM05/\/geFM10/g}' geometryExtended2023DD4hep_xmlwriter.py
45-
cmsRun geometryExtended2023DD4hep_xmlwriter.py
43+
#sed -i '{s/ExtendedGeometry2023FlatMinus05Percent/ExtendedGeometry2023FlatMinus10Percent/g}' geometryExtended2023DD4hep_xmlwriter.py
44+
#sed -i '{s/\/geFM05/\/geFM10/g}' geometryExtended2023DD4hep_xmlwriter.py
45+
cmsRun geometryExtended2023DD4hep_xmlwriter.py --geom=ExtendedGeometry2023FlatMinus10Percent --out=geFM10 || die 'failed geometryExtended2023DD4hep_xmlwriter.py' $?
4646

47-
sed -i '{s/ExtendedGeometry2023FlatMinus10Percent/ExtendedGeometry2023FlatPlus05Percent/g}' geometryExtended2023DD4hep_xmlwriter.py
48-
sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2023DD4hep_xmlwriter.py
49-
cmsRun geometryExtended2023DD4hep_xmlwriter.py
47+
#sed -i '{s/ExtendedGeometry2023FlatMinus10Percent/ExtendedGeometry2023FlatPlus05Percent/g}' geometryExtended2023DD4hep_xmlwriter.py
48+
#sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2023DD4hep_xmlwriter.py
49+
cmsRun geometryExtended2023DD4hep_xmlwriter.py --geom=ExtendedGeometry2023FlatPlus05Percent --out=geFP05 || die 'failed geometryExtended2023DD4hep_xmlwriter.py ExtendedGeometry2023FlatPlus05Percent' $?
5050

51-
sed -i '{s/ExtendedGeometry2023FlatPlus05Percent/ExtendedGeometry2023FlatPlus10Percent/g}' geometryExtended2023DD4hep_xmlwriter.py
52-
sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2023DD4hep_xmlwriter.py
53-
cmsRun geometryExtended2023DD4hep_xmlwriter.py
51+
#sed -i '{s/ExtendedGeometry2023FlatPlus05Percent/ExtendedGeometry2023FlatPlus10Percent/g}' geometryExtended2023DD4hep_xmlwriter.py
52+
#sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2023DD4hep_xmlwriter.py
53+
cmsRun geometryExtended2023DD4hep_xmlwriter.py --geom=ExtendedGeometry2023FlatPlus10Percent --out=geFP10 || die 'failed geometryExtended2023DD4hep_xmlwriter.py' $?
5454

5555
# Read the one big XML file and output a record to the
5656
# database with the an identifying tag
@@ -61,25 +61,25 @@ cmsRun geometryExtended2023DD4hep_xmlwriter.py
6161
# Input file Output tag
6262
# gezSingleBigFile.xml XMLFILE_Geometry_${mytag}_Extended2023ZeroMaterial_mc
6363

64-
sed -i '{s/Extended/Extended2023ZeroMaterial/g}' xmlgeometrywriter.py
65-
sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
66-
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' $?
6767

68-
sed -i '{s/Extended2023ZeroMaterial/Extended2023FlatMinus05Percent/g}' xmlgeometrywriter.py
69-
sed -i '{s/\/gez/\/geFM05/g}' xmlgeometrywriter.py
70-
cmsRun xmlgeometrywriter.py
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' $?
7171

72-
sed -i '{s/Extended2023FlatMinus05Percent/Extended2023FlatMinus10Percent/g}' xmlgeometrywriter.py
73-
sed -i '{s/\/geFM05/\/geFM10/g}' xmlgeometrywriter.py
74-
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' $?
7575

76-
sed -i '{s/Extended2023FlatMinus10Percent/Extended2023FlatPlus05Percent/g}' xmlgeometrywriter.py
77-
sed -i '{s/\/geFM10/\/geFP05/g}' xmlgeometrywriter.py
78-
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' $?
7979

80-
sed -i '{s/Extended2023FlatPlus05Percent/Extended2023FlatPlus10Percent/g}' xmlgeometrywriter.py
81-
sed -i '{s/\/geFP05/\/geFP10/g}' xmlgeometrywriter.py
82-
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' $?
8383

8484
# All the database objects were written into one database
8585
# (myfile.db) in the steps above. Extract the different

0 commit comments

Comments
 (0)