Merge branch 'amdbART' into 'master'

Re-activate checkgeo_amdc ART test

See merge request atlas/athena!36181

MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_checkgeo_amdc.sh

@@ -7,13 +7,42 @@
 #
 # art-output: *.txt
 # art-output: *.data
+# art-output: *.PREsql
 
 art.py createpoolfile
 
 set -x
 
+# download an amdb file to test
 wget http://atlas.web.cern.ch/Atlas/GROUPS/MUON/AMDB/amdb_simrec.r.08.01
 # database_layout needed for AmdcDb/AmdcDb_TableCheck.py
-athena.py AmdcAth/AmdcAth_GeometryTasks.py -c "input_amdb_simrec='amdb_simrec.r.08.01';CheckAMDBTables=True;database_layout=''"
+athena.py AmdcAth/AmdcAth_GeometryTasks.py -c "input_amdb_simrec='amdb_simrec.r.08.01';CheckAMDBTables=True;database_layout='MuonSpectrometer-R.08.01'"
+
+exit_code=$?
+echo  "art-result: ${exit_code} AmdcAth_GeometryTasks.py"
+if [ ${exit_code} -ne 0 ]
+then
+    exit ${exit_code}
+fi
+
+# now check if the created DB files are non-empty
+aGoodFile=false
+for file in Out.AmdcOracle.DB.*
+do
+    nLines=$(cat "$file"|wc -l)
+    echo "${file} has ${nLines} lines" >> dbCheck.txt
+    if [ "$nLines" -gt 1 ] ; then
+        aGoodFile=true
+    fi
+done
+if [ "$aGoodFile" = false ] ; then
+    exit 1
+fi
+
+echo  "art-result: ${exit_code} file-check"
+if [ ${exit_code} -ne 0 ]
+then
+    exit ${exit_code}
+fi
 
 echo "art-result: $?"

MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_agdd.sh

@@ -11,7 +11,9 @@ art.py createpoolfile
 
 set -x
 
+# download the passive material AGDD xml file
 get_files passiveMat_r.08.02.xml
+# create the AGDD blob from it
 athena.py AmdcAth/AmdcAth_GeometryTasks.py -c "input_agdd_xml='passiveMat_r.08.02.xml';DoAGDDBlob=True;amdc_name='R.08'"
 
 echo "art-result: $?"

MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_agdd_viaAmdb.sh

@@ -11,7 +11,9 @@ art.py createpoolfile
 
 set -x
 
+# download an amdb file to test
 wget http://atlas.web.cern.ch/Atlas/GROUPS/MUON/AMDB/amdb_simrec.r.08.01
+# create the AGDD blob from it
 athena.py AmdcAth/AmdcAth_GeometryTasks.py -c "input_amdb_simrec='amdb_simrec.r.08.01';DoAGDDBlob=True;"
 
 echo "art-result: $?"

MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_amdc.sh

@@ -11,7 +11,9 @@ art.py createpoolfile
 
 set -x
 
+# download an amdb file to test
 wget http://atlas.web.cern.ch/Atlas/GROUPS/MUON/AMDB/amdb_simrec.r.08.01
+# create the AMDB tables from it
 athena.py AmdcAth/AmdcAth_GeometryTasks.py -c "input_amdb_simrec='amdb_simrec.r.08.01';DoAMDBTables=True;"
 
 echo "art-result: $?"

MuonSpectrometer/MuonValidation/MuonGeomValidation/MuonGeomRTT/test/test_gengeo_nswd.sh

@@ -11,8 +11,9 @@ art.py createpoolfile
 
 set -x
 
+# get the NSW AGDD xml file
 get_files stations.v2.07.xml
-
+# create a NSW layout from it
 athena.py AmdcAth/AmdcAth_GeometryTasks.py -c "input_nsw_xml='stations.v2.07.xml';DoNSWDBlob=True;"
 
 echo "art-result: $?"