.gitlab-ci.yml

@@ -47,7 +47,7 @@ test-python2.6:
 test-python2:
   stage: test
   script:
-    - python2 -m compileall -q -x "/python/MooreTests/" .
+    - python2 -m compileall -q -x "/python/MooreTests/|bandwidth_helpers" .
     - xenv -x PRConfig.xenv python2 -c "import PRConfig.TestFileDB"
 
 test-python3:

cmt/requirements

@@ -3,7 +3,7 @@
 # Maintainer : Ben Couturier
 #============================================================================
 package           PRConfig
-version           v1r62
+version           v1r63
 
 #============================================================================
 # Structure, i.e. directories to process.

doc/release.notes

@@ -4,6 +4,48 @@
 ! Purpose     : App Configuration for performance and regression tests
 !-----------------------------------------------------------------------------
 
+========================= PRConfig v1r63 2023-09-25 =========================
+
+! 2023-09-13 - commit 1fd8aa7
+
+ - Merge branch 'msaur_DC_Sim10aU1_Dst2D0pi_LowLumi.fix' into 'master'
+
+   Fix to DC_Sim10aU1_Dst2D0pi_LowLumi
+
+   See merge request lhcb-datapkg/PRConfig!347
+
+! 2023-09-12 - commit 6f88e4a
+
+ - Merge branch 'zcjUpdateFilesFromDirac' into 'master'
+
+   Add get_access_url function for data in FilesFromDirac
+
+   See merge request lhcb-datapkg/PRConfig!343
+
+! 2023-09-12 - commit 5efd848
+
+ - Merge branch 'erodrigu-enhance-sprucing' into 'master'
+
+   Enhance and fix Sprucing timing plot
+
+   See merge request lhcb-datapkg/PRConfig!345
+
+! 2023-09-11 - commit 070beea
+
+ - Merge branch 'rjhunter-bw-test-extra-info' into 'master'
+
+   Add more information to BW test pages
+
+   See merge request lhcb-datapkg/PRConfig!342
+
+! 2023-08-29 - commit 3801f15
+
+ - Merge branch 'rjhunter-fix-2023-bw-test' into 'master'
+
+   Small fixes to 2023 BW test
+
+   See merge request lhcb-datapkg/PRConfig!344
+
 ========================= PRConfig v1r62 2023-08-24 =========================
 
 ! 2023-08-23 - commit 50a59a1

options/Moore/DataChallenges/DC_Data2022_default_conds.py

@@ -24,7 +24,7 @@ options.dddb_tag = "master"
 options.conditions_version = "AlignmentV10_2023_05_09_LHCP"  #specific DD4hep tag
 #options.conditions_version = "master" #-- general settings for DD4hep builds
 options.data_type = "Upgrade"
-options.geometry_version = "trunk"
+options.geometry_version = "run3/trunk"
 options.conditions_version = "master"
 
 #options.output_level = 0

options/Moore/DataChallenges/DC_Data2022_default_conds_100k.py

@@ -24,7 +24,7 @@ options.dddb_tag = "master"
 options.conditions_version = "AlignmentV10_2023_05_09_LHCP"  #specific DD4hep tag
 #options.conditions_version = "master" #-- general settings for DD4hep builds
 options.data_type = "Upgrade"
-options.geometry_version = "trunk"
+options.geometry_version = "run3/trunk"
 options.conditions_version = "master"
 
 #options.output_level = 0

options/Moore/DataChallenges/DC_Data2022_default_conds_10k.py

@@ -24,7 +24,7 @@ options.dddb_tag = "master"
 options.conditions_version = "AlignmentV10_2023_05_09_LHCP"  #specific DD4hep tag
 #options.conditions_version = "master" #-- general settings for DD4hep builds
 options.data_type = "Upgrade"
-options.geometry_version = "trunk"
+options.geometry_version = "run3/trunk"
 options.conditions_version = "master"
 
 #options.output_level = 0

options/Moore/DataChallenges/DC_Sim10aU1_B2Kstee.py

@@ -10,9 +10,9 @@
 ###############################################################################
 from Moore import options
 
-from PRConfig.FilesFromDirac import get_access_urls
+from PRConfig.FilesFromDirac import get_access_urls_mc
 
-options.input_files = get_access_urls(
+options.input_files = get_access_urls_mc(
     "/MC/Upgrade/Beam7000GeV-Upgrade-MagDown-Nu7.6-25ns-Pythia8/Sim10aU1",
     "11124001", ["XDIGI"])
 options.input_type = "ROOT"

options/Moore/DataChallenges/DC_Sim10aU1_B2Kstee_LowLumi.py

@@ -10,9 +10,9 @@
 ###############################################################################
 from Moore import options
 
-from PRConfig.FilesFromDirac import get_access_urls
+from PRConfig.FilesFromDirac import get_access_urls_mc
 
-options.input_files = get_access_urls(
+options.input_files = get_access_urls_mc(
     "/MC/Upgrade/Beam7000GeV-Upgrade-MagDown-Nu3.8-25ns-Pythia8/Sim10aU1",
     "11124001", ["XDIGI"])
 options.input_type = "ROOT"

options/Moore/DataChallenges/DC_Sim10aU1_Bd2Kstgamma.py

@@ -10,9 +10,9 @@
 ###############################################################################
 from Moore import options
 
-from PRConfig.FilesFromDirac import get_access_urls
+from PRConfig.FilesFromDirac import get_access_urls_mc
 
-options.input_files = get_access_urls(
+options.input_files = get_access_urls_mc(
     "/MC/Upgrade/Beam7000GeV-Upgrade-MagDown-Nu7.6-25ns-Pythia8/Sim10aU1",
     "11102202", ["XDIGI"])
 options.input_type = "ROOT"

options/Moore/DataChallenges/DC_Sim10aU1_Bd2Kstgamma_LowLumi.py

@@ -10,9 +10,9 @@
 ###############################################################################
 from Moore import options
 
-from PRConfig.FilesFromDirac import get_access_urls
+from PRConfig.FilesFromDirac import get_access_urls_mc
 
-options.input_files = get_access_urls(
+options.input_files = get_access_urls_mc(
     "/MC/Upgrade/Beam7000GeV-Upgrade-MagDown-Nu3.8-25ns-Pythia8/Sim10aU1",
     "11102202", ["XDIGI"])
 options.input_type = "ROOT"

options/Moore/DataChallenges/DC_Sim10aU1_Bs2JPsiPhi.py

@@ -10,9 +10,9 @@
 ###############################################################################
 from Moore import options
 
-from PRConfig.FilesFromDirac import get_access_urls
+from PRConfig.FilesFromDirac import get_access_urls_mc
 
-options.input_files = get_access_urls(
+options.input_files = get_access_urls_mc(
     "/MC/Upgrade/Beam7000GeV-Upgrade-MagDown-Nu7.6-25ns-Pythia8/Sim10aU1",
     "13144011", ["XDIGI"])
 options.input_type = "ROOT"

options/Moore/DataChallenges/DC_Sim10aU1_Bs2JPsiPhi_LowLumi.py

@@ -10,9 +10,9 @@
 ###############################################################################
 from Moore import options
 
-from PRConfig.FilesFromDirac import get_access_urls
+from PRConfig.FilesFromDirac import get_access_urls_mc
 
-options.input_files = get_access_urls(
+options.input_files = get_access_urls_mc(
     "/MC/Upgrade/Beam7000GeV-Upgrade-MagDown-Nu3.8-25ns-Pythia8/Sim10aU1",
     "13144011", ["XDIGI"])
 options.input_type = "ROOT"

options/Moore/DataChallenges/DC_Sim10aU1_Bs2PhiPhi.py

@@ -10,9 +10,9 @@
 ###############################################################################
 from Moore import options
 
-from PRConfig.FilesFromDirac import get_access_urls
+from PRConfig.FilesFromDirac import get_access_urls_mc
 
-options.input_files = get_access_urls(
+options.input_files = get_access_urls_mc(
     "/MC/Upgrade/Beam7000GeV-Upgrade-MagDown-Nu7.6-25ns-Pythia8/Sim10aU1",
     "13104012", ["XDIGI"])
 options.input_type = "ROOT"

options/Moore/DataChallenges/DC_Sim10aU1_Bs2PhiPhi_LowLumi.py

@@ -10,9 +10,9 @@
 ###############################################################################
 from Moore import options
 
-from PRConfig.FilesFromDirac import get_access_urls
+from PRConfig.FilesFromDirac import get_access_urls_mc
 
-options.input_files = get_access_urls(
+options.input_files = get_access_urls_mc(
     "/MC/Upgrade/Beam7000GeV-Upgrade-MagDown-Nu3.8-25ns-Pythia8/Sim10aU1",
     "13104012", ["XDIGI"])
 options.input_type = "ROOT"

options/Moore/DataChallenges/DC_Sim10aU1_DD4HEP_conds.py

@@ -15,6 +15,6 @@ from Moore import options
 from DDDB.CheckDD4Hep import UseDD4Hep
 if UseDD4Hep:
     from Configurables import DDDBConf
-    DDDBConf().GeometryVersion = 'before-rich1-geom-update-26052022'
+    DDDBConf().GeometryVersion = 'run3/before-rich1-geom-update-26052022'
 
 options.evt_max = 1000

options/Moore/DataChallenges/DC_Sim10aU1_DD4HEP_conds_10k.py

@@ -15,6 +15,6 @@ from Moore import options
 from DDDB.CheckDD4Hep import UseDD4Hep
 if UseDD4Hep:
     from Configurables import DDDBConf
-    DDDBConf().GeometryVersion = 'before-rich1-geom-update-26052022'
+    DDDBConf().GeometryVersion = 'run3/before-rich1-geom-update-26052022'
 
 options.evt_max = 10000

options/Moore/DataChallenges/DC_Sim10aU1_Dst2D0pi.py

@@ -10,9 +10,9 @@
 ###############################################################################
 from Moore import options
 
-from PRConfig.FilesFromDirac import get_access_urls
+from PRConfig.FilesFromDirac import get_access_urls_mc
 
-options.input_files = get_access_urls(
+options.input_files = get_access_urls_mc(
     "/MC/Upgrade/Beam7000GeV-Upgrade-MagDown-Nu7.6-25ns-Pythia8/Sim10aU1",
     "27265100", ["XDIGI"])
 options.input_type = "ROOT"

options/Moore/DataChallenges/DC_Sim10aU1_Dst2D0pi_LowLumi.py

@@ -10,9 +10,9 @@
 ###############################################################################
 from Moore import options
 
-from PRConfig.FilesFromDirac import get_access_urls
+from PRConfig.FilesFromDirac import get_access_urls_mc
 
-options.input_files = get_access_urls(
+options.input_files = get_access_urls_mc(
     "/MC/Upgrade/Beam7000GeV-Upgrade-MagDown-Nu3.8-25ns-Pythia8/Sim10aU1",
     "27265100", ["XDIGI"])
 options.input_type = "ROOT"

options/Moore/DataChallenges/DC_Sim10aU1_MinBias.py

@@ -10,9 +10,9 @@
 ###############################################################################
 from Moore import options
 
-from PRConfig.FilesFromDirac import get_access_urls
+from PRConfig.FilesFromDirac import get_access_urls_mc
 
-options.input_files = get_access_urls(
+options.input_files = get_access_urls_mc(
     "/MC/Upgrade/Beam7000GeV-Upgrade-MagDown-Nu7.6-25ns-Pythia8/Sim10aU1",
     "30000000", ["XDIGI"])
 options.input_type = "ROOT"

options/Moore/DataChallenges/DC_Sim10aU1_MinBias_LowLumi.py

@@ -10,9 +10,9 @@
 ###############################################################################
 from Moore import options
 
-from PRConfig.FilesFromDirac import get_access_urls
+from PRConfig.FilesFromDirac import get_access_urls_mc
 
-options.input_files = get_access_urls(
+options.input_files = get_access_urls_mc(
     "/MC/Upgrade/Beam7000GeV-Upgrade-MagDown-Nu3.8-25ns-Pythia8/Sim10aU1",
     "30000000", ["XDIGI"])
 options.input_type = "ROOT"