Merge pull request #47381 from bsunanda/Run3-gex17G

Run3-gex187G Modify the scripts to prepare the DDD payloads for the Run2 scenarios

Author: cmsbuild

CondTools/Geometry/test/writehelpers/createExtended2016Payloads.sh

@@ -11,7 +11,7 @@ echo ${mytag}
 
 # Set the tag in all the scripts and the metadata text files
 sed -i {s/TagXX/${mytag}/g} *.py
-sed -i {s/TagXX/${mytag}/g} *.txt
+#sed -i {s/TagXX/${mytag}/g} *.txt
 sed -i {s/TagXX/${mytag}/g} splitExtended2016Database.sh
 
 # First read in the little XML files and create the

CondTools/Geometry/test/writehelpers/createExtended2017Payloads.sh

@@ -11,7 +11,7 @@ echo ${mytag}
 
 # Set the tag in all the scripts and the metadata text files
 sed -i {s/TagXX/${mytag}/g} *.py
-sed -i {s/TagXX/${mytag}/g} *.txt
+#sed -i {s/TagXX/${mytag}/g} *.txt
 sed -i {s/TagXX/${mytag}/g} splitExtended2017Database.sh
 
 # First read in the little XML files and create the

CondTools/Geometry/test/writehelpers/createExtended2017Plan1Payloads.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-
+function die { echo $1: status $2 ;  exit $2; }
 
 if [ $# -ne 1 ]
 then
@@ -10,80 +10,79 @@ mytag=$1
 echo ${mytag}
 
 # Set the tag in all the scripts and the metadata text files
-sed -i {s/TagXX/${mytag}/g} *.py
+#sed -i {s/TagXX/${mytag}/g} *.py
 compgen -G "*.txt" > /dev/null && sed -i {s/TagXX/${mytag}/g} *.txt
 sed -i {s/TagXX/${mytag}/g} splitExtended2017Plan1Database.sh
 
 # First read in the little XML files and create the
-# large XML file for the Phase1_R30F12_HCal Ideal scenario.
-# Input cff                                             Output file
-# GeometryExtended2017Plan1_cff                       geSingleBigFile.xml
-cmsRun geometryExtended2017Plan1_xmlwriter.py
+# big XML file for the Extended2017Plan1 scenario.
+cmsRun geometryExtended2017Plan1_xmlwriter.py || die 'failed geometryExtended2017Plan1_xmlwriter.py' $?
 
 # Now convert the content of the large XML file into
 # a "blob" and write it to the database.
 # Also reads in the little XML files again and fills
 # the DDCompactView. From the DDCompactView the
 # reco parts of the database are also filled.
-cmsRun geometryExtended2017Plan1_writer.py
+cmsRun geometryExtended2017Plan1_writer.py --tag=${mytag} || die 'failed geometryExtended2017Plan1_writer.py' $?
 
 # Now put the other scenarios into the database.
 # Input the many XML files referenced by the cff file and
 # output a single big XML file.
 # This is repeated several times below.  The sed commands
-# serve to give the following sequence of input and output
+# serve to give the correct sequence of input and output
 # files
-#
-# Input cff                    Output file
-# GeometryIdeal_cff            giSingleBigFile.xml
-#
-sed -i '{s/Extended2017Plan1/Extended2017Plan1ZeroMaterial/g}' geometryExtended2017Plan1_xmlwriter.py
-sed -i '{s/\/ge/\/gez/g}' geometryExtended2017Plan1_xmlwriter.py
-cmsRun geometryExtended2017Plan1_xmlwriter.py
-
-sed -i '{s/Extended2017Plan1ZeroMaterial/Extended2017Plan1FlatMinus05Percent/g}' geometryExtended2017Plan1_xmlwriter.py
-sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2017Plan1_xmlwriter.py
-cmsRun geometryExtended2017Plan1_xmlwriter.py
-
-sed -i '{s/Extended2017Plan1FlatMinus10Percent/Extended2017Plan1FlatPlus05Percent/g}' geometryExtended2017Plan1_xmlwriter.py
-sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2017Plan1_xmlwriter.py
-cmsRun geometryExtended2017Plan1_xmlwriter.py
-
-sed -i '{s/Extended2017Plan1FlatPlus05Percent/Extended2017Plan1FlatPlus10Percent/g}' geometryExtended2017Plan1_xmlwriter.py
-sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2017Plan1_xmlwriter.py
-cmsRun geometryExtended2017Plan1_xmlwriter.py
+
+#sed -i '{s/Extended2017Plan1/Extended2017Plan1ZeroMaterial/g}' geometryExtended2017Plan1_xmlwriter.py
+#sed -i '{s/\/ge/\/gez/g}' geometryExtended2017Plan1_xmlwriter.py
+cmsRun geometryExtended2017Plan1_xmlwriter.py --geom=Extended2017Plan1ZeroMaterial --out=gez || die 'failed geometryExtended2017Plan1_xmlwriter.py Extended2017Plan1ZeroMaterial' $?
+
+#sed -i '{s/Extended2017Plan1ZeroMaterial/Extended2017Plan1FlatMinus05Percent/g}' geometryExtended2017Plan1_xmlwriter.py
+#sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2017Plan1_xmlwriter.py
+cmsRun geometryExtended2017Plan1_xmlwriter.py --geom=Extended2017Plan1FlatMinus05Percent --out=geFM05 || die 'failed geometryExtended2017Plan1_xmlwriter.py Extended2017Plan1FlatMinus05Percent' $?
+
+#sed -i '{s/Extended2017Plan1FlatMinus05Percent/Extended2017Plan1FlatMinus10Percent/g}' geometryExtended2017Plan1_xmlwriter.py
+#sed -i '{s/\/geFM05/\/geFM10/g}' geometryExtended2017Plan1_xmlwriter.py
+cmsRun geometryExtended2017Plan1_xmlwriter.py --geom=Extended2017Plan1FlatMinus10Percent --out=geFM10 || die 'failed geometryExtended2017Plan1_xmlwriter.py' $?
+
+#sed -i '{s/Extended2017Plan1FlatMinus10Percent/Extended2017Plan1FlatPlus05Percent/g}' geometryExtended2017Plan1_xmlwriter.py
+#sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2017Plan1_xmlwriter.py
+cmsRun geometryExtended2017Plan1_xmlwriter.py --geom=Extended2017Plan1FlatPlus05Percent --out=geFP05 || die 'failed geometryExtended2017Plan1_xmlwriter.py Extended2017Plan1FlatPlus05Percent' $?
+
+#sed -i '{s/Extended2017Plan1FlatPlus05Percent/Extended2017Plan1FlatPlus10Percent/g}' geometryExtended2017Plan1_xmlwriter.py
+#sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2017Plan1_xmlwriter.py
+cmsRun geometryExtended2017Plan1_xmlwriter.py --geom=Extended2017Plan1FlatPlus10Percent --out=geFP10 || die 'failed geometryExtended2017Plan1_xmlwriter.py' $?
 
 # Read the one big XML file and output a record to the
 # database with the an identifying tag
 # This is repeated several times below.  The sed commands
-# serve to give the following sequence of input file and output
+# serve to give the correct sequence of input file and output
 # tag
-#
+# To start:
 # Input file                Output tag
 # gezSingleBigFile.xml      XMLFILE_Geometry_${mytag}_Extended2017Plan1ZeroMaterial_mc
-#
-sed -i '{s/Extended/Extended2017Plan1ZeroMaterial/g}' xmlgeometrywriter.py
-sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
 
-sed -i '{s/Extended2017Plan1ZeroMaterial/Extended2017Plan1FlatMinus05Percent/g}' xmlgeometrywriter.py
-sed -i '{s/\/gez/\/geFM05/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended/Extended2017Plan1ZeroMaterial/g}' xmlgeometrywriter.py
+#sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2017Plan1ZeroMaterial --inPre=gez|| die 'failed xmlgeometrywriter.py Extended2017Plan1ZeroMaterial' $?
+
+#sed -i '{s/Extended2017Plan1ZeroMaterial/Extended2017Plan1FlatMinus05Percent/g}' xmlgeometrywriter.py
+#sed -i '{s/\/gez/\/geFM05/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2017Plan1FlatMinus05Percent --inPre=geFM05 || die 'failed xmlgeometrywriter.py Extended2017Plan1FlatMinus05Percent' $?
 
-sed -i '{s/Extended2017Plan1FlatMinus05Percent/Extended2017Plan1FlatMinus10Percent/g}' xmlgeometrywriter.py
-sed -i '{s/\/geFM05/\/geFM10/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended2017Plan1FlatMinus05Percent/Extended2017Plan1FlatMinus10Percent/g}' xmlgeometrywriter.py
+#sed -i '{s/\/geFM05/\/geFM10/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2017Plan1FlatMinus10Percent --inPre=geFM10 || die 'failed xmlgeometrywriter.py Extended2017Plan1FlatMinus10Percent' $?
 
-sed -i '{s/Extended2017Plan1FlatMinus10Percent/Extended2017Plan1FlatPlus05Percent/g}' xmlgeometrywriter.py
-sed -i '{s/\/geFM10/\/geFP05/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended2017Plan1FlatMinus10Percent/Extended2017Plan1FlatPlus05Percent/g}' xmlgeometrywriter.py
+#sed -i '{s/\/geFM10/\/geFP05/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2017Plan1FlatPlus05Percent --inPre=geFP05 || die 'failed xmlgeometrywriter.py Extended2017Plan1FlatPlus05Percent' $?
 
-sed -i '{s/Extended2017Plan1FlatPlus05Percent/Extended2017Plan1FlatPlus10Percent/g}' xmlgeometrywriter.py
-sed -i '{s/\/geFP05/\/geFP10/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended2017Plan1FlatPlus05Percent/Extended2017Plan1FlatPlus10Percent/g}' xmlgeometrywriter.py
+#sed -i '{s/\/geFP05/\/geFP10/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2017Plan1FlatPlus10Percent --inPre=geFP10 || die 'failed xmlgeometrywriter.py Extended2017Plan1FlatPlus10Percent' $?
 
 # All the database objects were written into one database
 # (myfile.db) in the steps above.  Extract the different
 # pieces into separate database files.  These are the payloads
-# that get uploaded to the dropbox.  There is one for each tag
+# that get uploaded to the DB.  There is one for each tag
 ./splitExtended2017Plan1Database.sh

CondTools/Geometry/test/writehelpers/createExtended2018Payloads.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-
+function die { echo $1: status $2 ;  exit $2; }
 
 if [ $# -ne 1 ]
 then
@@ -10,92 +10,79 @@ mytag=$1
 echo ${mytag}
 
 # Set the tag in all the scripts and the metadata text files
-sed -i {s/TagXX/${mytag}/g} *.py
+#sed -i {s/TagXX/${mytag}/g} *.py
 compgen -G "*.txt" > /dev/null && sed -i {s/TagXX/${mytag}/g} *.txt
 sed -i {s/TagXX/${mytag}/g} splitExtended2018Database.sh
 
 # First read in the little XML files and create the
-# large XML file for the Phase1_R30F12_HCal Ideal scenario.
-# Input cff                                             Output file
-# GeometryExtended2018_cff                       geSingleBigFile.xml
-cmsRun geometryExtended2018_xmlwriter.py
+# big XML file for the Extended2018 scenario.
+cmsRun geometryExtended2018_xmlwriter.py || die 'failed geometryExtended2018_xmlwriter.py' $?
 
 # Now convert the content of the large XML file into
 # a "blob" and write it to the database.
 # Also reads in the little XML files again and fills
 # the DDCompactView. From the DDCompactView the
 # reco parts of the database are also filled.
-cmsRun geometryExtended2018_writer.py
+cmsRun geometryExtended2018_writer.py --tag=${mytag} || die 'failed geometryExtended2018_writer.py' $?
 
 # Now put the other scenarios into the database.
 # Input the many XML files referenced by the cff file and
 # output a single big XML file.
 # This is repeated several times below.  The sed commands
-# serve to give the following sequence of input and output
+# serve to give the correct sequence of input and output
 # files
-#
-# Input cff                    Output file
-# GeometryIdeal_cff            giSingleBigFile.xml
-#
-sed -i '{s/Extended2018/Extended2018ZeroMaterial/g}' geometryExtended2018_xmlwriter.py
-sed -i '{s/\/ge/\/gez/g}' geometryExtended2018_xmlwriter.py
-cmsRun geometryExtended2018_xmlwriter.py
-
-sed -i '{s/Extended2018ZeroMaterial/Extended2018DetailedCavern/g}' geometryExtended2018_xmlwriter.py
-sed -i '{s/\/gez/\/geDC/g}' geometryExtended2018_xmlwriter.py
-cmsRun geometryExtended2018_xmlwriter.py
-
-sed -i '{s/Extended2018DetailedCavern/Extended2018FlatMinus05Percent/g}' geometryExtended2018_xmlwriter.py
-sed -i '{s/\/geDC/\/geFM05/g}' geometryExtended2018_xmlwriter.py
-cmsRun geometryExtended2018_xmlwriter.py
-
-sed -i '{s/Extended2018FlatMinus05Percent/Extended2018FlatMinus10Percent/g}' geometryExtended2018_xmlwriter.py
-sed -i '{s/\/geFM05/\/geFM10/g}' geometryExtended2018_xmlwriter.py
-cmsRun geometryExtended2018_xmlwriter.py
-
-sed -i '{s/Extended2018FlatMinus10Percent/Extended2018FlatPlus05Percent/g}' geometryExtended2018_xmlwriter.py
-sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2018_xmlwriter.py
-cmsRun geometryExtended2018_xmlwriter.py
-
-sed -i '{s/Extended2018FlatPlus05Percent/Extended2018FlatPlus10Percent/g}' geometryExtended2018_xmlwriter.py
-sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2018_xmlwriter.py
-cmsRun geometryExtended2018_xmlwriter.py
+
+#sed -i '{s/Extended2018/Extended2018ZeroMaterial/g}' geometryExtended2018_xmlwriter.py
+#sed -i '{s/\/ge/\/gez/g}' geometryExtended2018_xmlwriter.py
+cmsRun geometryExtended2018_xmlwriter.py --geom=Extended2018ZeroMaterial --out=gez || die 'failed geometryExtended2018_xmlwriter.py Extended2018ZeroMaterial' $?
+
+#sed -i '{s/Extended2018ZeroMaterial/Extended2018FlatMinus05Percent/g}' geometryExtended2018_xmlwriter.py
+#sed -i '{s/\/gez/\/geFM05/g}' geometryExtended2018_xmlwriter.py
+cmsRun geometryExtended2018_xmlwriter.py --geom=Extended2018FlatMinus05Percent --out=geFM05 || die 'failed geometryExtended2018_xmlwriter.py Extended2018FlatMinus05Percent' $?
+
+#sed -i '{s/Extended2018FlatMinus05Percent/Extended2018FlatMinus10Percent/g}' geometryExtended2018_xmlwriter.py
+#sed -i '{s/\/geFM05/\/geFM10/g}' geometryExtended2018_xmlwriter.py
+cmsRun geometryExtended2018_xmlwriter.py --geom=Extended2018FlatMinus10Percent --out=geFM10 || die 'failed geometryExtended2018_xmlwriter.py' $?
+
+#sed -i '{s/Extended2018FlatMinus10Percent/Extended2018FlatPlus05Percent/g}' geometryExtended2018_xmlwriter.py
+#sed -i '{s/\/geFM10/\/geFP05/g}' geometryExtended2018_xmlwriter.py
+cmsRun geometryExtended2018_xmlwriter.py --geom=Extended2018FlatPlus05Percent --out=geFP05 || die 'failed geometryExtended2018_xmlwriter.py Extended2018FlatPlus05Percent' $?
+
+#sed -i '{s/Extended2018FlatPlus05Percent/Extended2018FlatPlus10Percent/g}' geometryExtended2018_xmlwriter.py
+#sed -i '{s/\/geFP05/\/geFP10/g}' geometryExtended2018_xmlwriter.py
+cmsRun geometryExtended2018_xmlwriter.py --geom=Extended2018FlatPlus10Percent --out=geFP10 || die 'failed geometryExtended2018_xmlwriter.py' $?
 
 # Read the one big XML file and output a record to the
 # database with the an identifying tag
 # This is repeated several times below.  The sed commands
-# serve to give the following sequence of input file and output
+# serve to give the correct sequence of input file and output
 # tag
-#
+# To start:
 # Input file                Output tag
 # gezSingleBigFile.xml      XMLFILE_Geometry_${mytag}_Extended2018ZeroMaterial_mc
-#
-sed -i '{s/Extended/Extended2018ZeroMaterial/g}' xmlgeometrywriter.py
-sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
 
-sed -i '{s/Extended2018ZeroMaterial/Extended2018DetailedCavern/g}' xmlgeometrywriter.py
-sed -i '{s/\/gez/\/geDC/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended/Extended2018ZeroMaterial/g}' xmlgeometrywriter.py
+#sed -i '{s/\/ge/\/gez/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2018ZeroMaterial --inPre=gez|| die 'failed xmlgeometrywriter.py Extended2018ZeroMaterial' $?
 
-sed -i '{s/Extended2018DetailedCavern/Extended2018FlatMinus05Percent/g}' xmlgeometrywriter.py
-sed -i '{s/\/geDC/\/geFM05/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended2018ZeroMaterial/Extended2018FlatMinus05Percent/g}' xmlgeometrywriter.py
+#sed -i '{s/\/gez/\/geFM05/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2018FlatMinus05Percent --inPre=geFM05 || die 'failed xmlgeometrywriter.py Extended2018FlatMinus05Percent' $?
 
-sed -i '{s/Extended2018FlatMinus05Percent/Extended2018FlatMinus10Percent/g}' xmlgeometrywriter.py
-sed -i '{s/\/geFM05/\/geFM10/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended2018FlatMinus05Percent/Extended2018FlatMinus10Percent/g}' xmlgeometrywriter.py
+#sed -i '{s/\/geFM05/\/geFM10/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2018FlatMinus10Percent --inPre=geFM10 || die 'failed xmlgeometrywriter.py Extended2018FlatMinus10Percent' $?
 
-sed -i '{s/Extended2018FlatMinus10Percent/Extended2018FlatPlus05Percent/g}' xmlgeometrywriter.py
-sed -i '{s/\/geFM10/\/geFP05/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended2018FlatMinus10Percent/Extended2018FlatPlus05Percent/g}' xmlgeometrywriter.py
+#sed -i '{s/\/geFM10/\/geFP05/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2018FlatPlus05Percent --inPre=geFP05 || die 'failed xmlgeometrywriter.py Extended2018FlatPlus05Percent' $?
 
-sed -i '{s/Extended2018FlatPlus05Percent/Extended2018FlatPlus10Percent/g}' xmlgeometrywriter.py
-sed -i '{s/\/geFP05/\/geFP10/g}' xmlgeometrywriter.py
-cmsRun xmlgeometrywriter.py
+#sed -i '{s/Extended2018FlatPlus05Percent/Extended2018FlatPlus10Percent/g}' xmlgeometrywriter.py
+#sed -i '{s/\/geFP05/\/geFP10/g}' xmlgeometrywriter.py
+cmsRun xmlgeometrywriter.py --tag=${mytag} --out=Extended2018FlatPlus10Percent --inPre=geFP10 || die 'failed xmlgeometrywriter.py Extended2018FlatPlus10Percent' $?
 
 # All the database objects were written into one database
 # (myfile.db) in the steps above.  Extract the different
 # pieces into separate database files.  These are the payloads
-# that get uploaded to the dropbox.  There is one for each tag
+# that get uploaded to the DB.  There is one for each tag
 ./splitExtended2018Database.sh