Merge branch 'master' into NewDeploymentScripts

dmwm · Oct 11, 2024 · 7cf0b6b · 7cf0b6b
2 parents 9371aee + ad17a5b
commit 7cf0b6b
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 32 deletions.
diff --git a/bin/00_pypi_deploy_prod.sh b/bin/00_pypi_deploy_prod.sh
@@ -30,8 +30,8 @@ then
     exit
 fi
 
-WMAGENT_TAG=2.3.4
-TIER0_VERSION=3.2.3
+WMAGENT_TAG=2.3.5
+TIER0_VERSION=3.2.5
 COUCH_TAG=3.2.2
 
 BASE_DIR=/data/tier0

diff --git a/bin/00_pypi_deploy_replay.sh b/bin/00_pypi_deploy_replay.sh
@@ -15,8 +15,8 @@ then
     exit
 fi
 
-WMAGENT_TAG=2.3.4rc11
-TIER0_VERSION=3.2.4rc1
+WMAGENT_TAG=2.3.5
+TIER0_VERSION=3.2.5
 COUCH_TAG=3.2.2
 
 BASE_DIR=/data/tier0

diff --git a/bin/00_pypi_tweak_prod_config.sh b/bin/00_pypi_tweak_prod_config.sh
@@ -17,7 +17,6 @@ sed -i "s+'team1,team2,cmsdataops'+'tier0production'+g" "$config/config.py"
 sed -i "s+config.RucioInjector.containerDiskRuleParams.*+config.RucioInjector.containerDiskRuleParams = {}+" "$config/config.py"
 echo "config.RucioInjector.blockRuleParams = {}" >> $config/config.py
 sed -i "s+config.RucioInjector.metaDIDProject.*+config.RucioInjector.metaDIDProject = 'Tier0'+" "$config/config.py"
-echo "config.RucioInjector.blockDeletionDelayHours = 168" >> $config/config.py
 ##### NOT IN REPLAY #####
 echo "config.RucioInjector.blockDeletionDelayHours = 168" >> $config/config.py
 echo 'config.BossAir.pluginNames = ["SimpleCondorPlugin"]' >> $config/config.py

diff --git a/etc/ProdOfflineConfiguration.py b/etc/ProdOfflineConfiguration.py
@@ -42,11 +42,6 @@
 # Set the max run number:
 setInjectMaxRun(tier0Config, 9999999)
 
-# Set streams to ignore by agent. These will not be injected by the MainAgent
-setHelperAgentStreams(tier0Config, {"SecondAgent" : [],
-                                      "ThirdAgent" : []})
-
-
 # Settings up sites
 processingSite = "T2_CH_CERN"
 storageSite = "T0_CH_CERN_Disk"
@@ -65,7 +60,7 @@
 #  Data type
 #  Processing site (where jobs run)
 #  PhEDEx locations
-setAcquisitionEra(tier0Config, "Run2024H")
+setAcquisitionEra(tier0Config, "Run2024I")
 setEmulationAcquisitionEra(tier0Config, "Emulation2024")
 setBaseRequestPriority(tier0Config, 251000)
 setBackfill(tier0Config, None)
@@ -106,7 +101,7 @@
 # maxRunPreviousConfig = 999999 # Last run before era change 08/09/23
 # Defaults for CMSSW version
 defaultCMSSWVersion = {
-    'default': "CMSSW_14_0_16",
+    'default': "CMSSW_14_0_18",
     #'acqEra': {'Run2024F': "CMSSW_14_0_11"},
     #'maxRun': {maxRunPreviousConfig: "CMSSW_13_2_2"}
 }
@@ -128,18 +123,19 @@
 alcaPPSScenario = "AlCaPPS_Run3"
 hiTestppScenario = "ppEra_Run3_pp_on_PbPb_2023"
 hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023"
+hltScoutingScenario = "hltScoutingEra_Run3_2024"
 
 # Defaults for processing version
 alcarawProcVersion = {
-    'default': 1
+    'default': 2
 }
 
 defaultProcVersionReco = {
-    'default': 1
+    'default': 2
 }
 
 expressProcVersion = {
-    'default': 1
+    'default': 2
 }
 
 # Defaults for GlobalTag
@@ -564,7 +560,7 @@
                scenario=ppScenario)
 
 DATASETS = ["ParkingSingleMuon","ParkingSingleMuon0"]
-
+PARKING_PDS = DATASETS
 for dataset in DATASETS:
     addDataset(tier0Config, dataset,
                do_reco=True,
@@ -577,7 +573,7 @@
             "ParkingSingleMuon4","ParkingSingleMuon5","ParkingSingleMuon6",
             "ParkingSingleMuon7","ParkingSingleMuon8","ParkingSingleMuon9",
             "ParkingSingleMuon10","ParkingSingleMuon11"]
-
+PARKING_PDS += DATASETS
 for dataset in DATASETS:
     addDataset(tier0Config, dataset,
                do_reco=True,
@@ -588,7 +584,7 @@
                scenario=ppScenario)
 
 DATASETS = ["ParkingDoubleMuonLowMass0"]
-
+PARKING_PDS += DATASETS
 for dataset in DATASETS:
     addDataset(tier0Config, dataset,
                do_reco=True,
@@ -603,7 +599,7 @@
 DATASETS = ["ParkingDoubleMuonLowMass1","ParkingDoubleMuonLowMass2",
             "ParkingDoubleMuonLowMass3","ParkingDoubleMuonLowMass4","ParkingDoubleMuonLowMass5",
             "ParkingDoubleMuonLowMass6","ParkingDoubleMuonLowMass7"]
-
+PARKING_PDS += DATASETS
 for dataset in DATASETS:
     addDataset(tier0Config, dataset,
                do_reco=True,
@@ -644,7 +640,7 @@
             "ParkingVBF1", "ParkingVBF2", "ParkingVBF3",
             "ParkingVBF4", "ParkingVBF5", "ParkingVBF6",
             "ParkingVBF7"]
-
+PARKING_PDS += DATASETS
 for dataset in DATASETS:
     addDataset(tier0Config, dataset,
                do_reco=True,
@@ -657,7 +653,7 @@
                scenario=ppScenario)
 
 DATASETS = ["ParkingLLP"]
-
+PARKING_PDS += DATASETS
 for dataset in DATASETS:
     addDataset(tier0Config, dataset,
                do_reco=True,
@@ -1319,12 +1315,15 @@
 DATASETS = ["ScoutingPFRun3"]
 for dataset in DATASETS:
     addDataset(tier0Config, dataset,
-               do_reco=False,
+               do_reco=True,
+               write_aod=False,
+               write_miniaod=False,
                tape_node="T1_US_FNAL_MSS",
                disk_node="T1_US_FNAL_Disk",
-               scenario=ppScenario)
+               scenario=hltScoutingScenario)
 
 DATASETS = ["ParkingDoubleElectronLowMass","ParkingDoubleElectronLowMass0"]
+PARKING_PDS += DATASETS
 for dataset in DATASETS:
     addDataset(tier0Config, dataset,
                do_reco=True,
@@ -1337,7 +1336,7 @@
 
 DATASETS = ["ParkingDoubleElectronLowMass1","ParkingDoubleElectronLowMass2",
             "ParkingDoubleElectronLowMass3","ParkingDoubleElectronLowMass4","ParkingDoubleElectronLowMass5"]
-
+PARKING_PDS += DATASETS
 for dataset in DATASETS:
     addDataset(tier0Config, dataset,
                do_reco=True,
@@ -1462,8 +1461,11 @@
 ignoreStream(tier0Config, "streamDQMRates")
 ignoreStream(tier0Config, "DQMPPSRandom")
 
+
 # Set streams to ignore by agent. These will not be injected
-setHelperAgentStreams(tier0Config, {"SecondAgent" : DATASETS_DAQ_TFTEST})
+SECOND_AGENT_PDS = PARKING_PDS + DATASETS_DAQ_TFTEST
+setHelperAgentStreams(tier0Config, {"SecondAgent" : SECOND_AGENT_PDS})
+
 
 ###################################
 ### currently inactive settings ###

diff --git a/etc/ReplayOfflineConfiguration.py b/etc/ReplayOfflineConfiguration.py
@@ -37,10 +37,10 @@
 setConfigVersion(tier0Config, "replace with real version")
 
 # Set run number to replay
-# 382726  Cosmics, 4 hours
 # 382686 - Collisions, 43.3 pb-1, 23.9583 TB NEW
+# 386674  Cosmics ~40 minutes in Run2024I with occupancy issues
 
-setInjectRuns(tier0Config, [382686, 382726])
+setInjectRuns(tier0Config, [382686, 386674])
 
 # Use this in order to limit the number of lumisections to process
 #setInjectLimit(tier0Config, 10)
@@ -116,7 +116,7 @@
 
 # Defaults for CMSSW version
 defaultCMSSWVersion = {
-    'default': "CMSSW_14_0_16"
+    'default': "CMSSW_14_0_18"
 }
 
 # Configure ScramArch
@@ -136,6 +136,7 @@
 alcaPPSScenario = "AlCaPPS_Run3"
 hiTestppScenario = "ppEra_Run3_pp_on_PbPb_2023"
 hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023"
+hltScoutingScenario = "hltScoutingEra_Run3_2024"
 
 # Procesing version number replays
 # Taking Replay processing ID from the last 8 digits of the DeploymentID
@@ -1213,8 +1214,10 @@
 DATASETS = ["ScoutingPFRun3"]
 for dataset in DATASETS:
     addDataset(tier0Config, dataset,
-               do_reco=False,
-               scenario=ppScenario)
+               do_reco=True,
+               write_aod=False,
+               write_miniaod=False,
+               scenario=hltScoutingScenario)
 
 DATASETS = ["ParkingDoubleElectronLowMass0","ParkingDoubleElectronLowMass1","ParkingDoubleElectronLowMass2",
             "ParkingDoubleElectronLowMass3","ParkingDoubleElectronLowMass4","ParkingDoubleElectronLowMass5",

diff --git a/src/python/T0/WMBS/Oracle/Create.py b/src/python/T0/WMBS/Oracle/Create.py
@@ -941,7 +941,8 @@ def __init__(self, logger = None, dbi = None, params = None):
                            48 : "ppEra_Run3_2023",
                            49 : "ppEra_Run3_pp_on_PbPb_2023",
                            50 : "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023",
-                           51 : "ppEra_Run3_2023_repacked"
+                           51 : "ppEra_Run3_2023_repacked",
+                           52 : "hltScoutingEra_Run3_2024"
                          }
         for id, name in list(eventScenarios.items()):
             sql = """INSERT INTO event_scenario

diff --git a/src/python/T0/__init__.py b/src/python/T0/__init__.py
@@ -4,5 +4,5 @@
 Core libraries for Workload Management Packages
 
 """
-__version__ = '3.2.4.pre2'
+__version__ = '3.2.5'
 __all__ = []