From d290d89a5d5392a9a4c1d84c22cd6477c3963f3c Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Wed, 4 Sep 2024 10:24:25 -0500 Subject: [PATCH 01/13] 2024 HI Replay config file based on HI Replay config file 2023 --- etc/HIReplayOfflineConfiguration.py | 38 ++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index ea9df7db2..092bc8775 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -8,6 +8,7 @@ from T0.RunConfig.Tier0Config import createTier0Config from T0.RunConfig.Tier0Config import setAcquisitionEra from T0.RunConfig.Tier0Config import setDefaultScramArch +from T0.RunConfig.Tier0Config import setScramArch from T0.RunConfig.Tier0Config import setBaseRequestPriority from T0.RunConfig.Tier0Config import setBackfill from T0.RunConfig.Tier0Config import setBulkDataType @@ -21,10 +22,12 @@ from T0.RunConfig.Tier0Config import addRepackConfig from T0.RunConfig.Tier0Config import addExpressConfig from T0.RunConfig.Tier0Config import setInjectRuns +from T0.RunConfig.Tier0Config import setInjectLimit from T0.RunConfig.Tier0Config import setStreamerPNN from T0.RunConfig.Tier0Config import setEnableUniqueWorkflowName from T0.RunConfig.Tier0Config import addSiteConfig from T0.RunConfig.Tier0Config import setStorageSite +from T0.RunConfig.Tier0Config import setExtraStreamDatasetMap # Create the Tier0 configuration object tier0Config = createTier0Config() @@ -64,7 +67,7 @@ # Data type # Processing site (where jobs run) # PhEDEx locations -setAcquisitionEra(tier0Config, "Tier0_HIREPLAY_2023") +setAcquisitionEra(tier0Config, "Tier0_HIREPLAY_2024") setBaseRequestPriority(tier0Config, 260000) setBackfill(tier0Config, 1) setBulkDataType(tier0Config, "hidata") @@ -107,7 +110,7 @@ # Defaults for CMSSW version defaultCMSSWVersion = { - 'default': "CMSSW_13_2_6_patch2" + 'default': "CMSSW_14_1_0_pre7" } # Configure ScramArch @@ -124,8 +127,13 @@ alcaTestEnableScenario = "AlCaTestEnable" alcaLumiPixelsScenario = "AlCaLumiPixels_Run3" alcaPPSScenario = "AlCaPPS_Run3" -hiTestppScenario = "ppEra_Run3_pp_on_PbPb_2023" -hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023" + +#hiTestppScenario = "ppEra_Run3_pp_on_PbPb_2023" +hiTestppScenario = "Run3_2024_UPC" + +#hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023" +hiRawPrimeScenario = "Run3_pp_on_PbPb_2024" + hiForwardScenario = "ppEra_Run3_2023_repacked" # Procesing version number replays @@ -162,6 +170,13 @@ } #set default repack settings for bulk streams + +setExtraStreamDatasetMap(tier0Config,{ + "L1Scouting": {"Dataset":"L1Scouting"}, + "L1ScoutingSelection": {"Dataset":"L1ScoutingSelection"} + } + ) + addRepackConfig(tier0Config, "Default", proc_ver=defaultProcVersion, maxSizeSingleLumi=24 * 1024 * 1024 * 1024, @@ -177,6 +192,21 @@ maxMemory=2000, versionOverride=repackVersionOverride) +addRepackConfig(tier0Config, "ScoutingPF", + proc_ver=defaultProcVersion, + dataTier="HLTSCOUT", + versionOverride=repackVersionOverride) + +addRepackConfig(tier0Config, "L1ScoutingSelection", + proc_ver=defaultProcVersion, + dataTier="L1SCOUT", + versionOverride=repackVersionOverride) + +addRepackConfig(tier0Config, "L1Scouting", + proc_ver=defaultProcVersion, + dataTier="L1SCOUT", + versionOverride=repackVersionOverride) + addDataset(tier0Config, "Default", do_reco=False, write_reco=False, write_aod=True, write_miniaod=True, write_nanoaod=False, write_dqm=False, From ba874cb8573e14939d56156d38eddf7d9bd192a3 Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Wed, 4 Sep 2024 11:13:34 -0500 Subject: [PATCH 02/13] Include 140X GTs for now --- etc/HIReplayOfflineConfiguration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index 092bc8775..f375d849b 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -144,8 +144,8 @@ alcarawProcVersion = dt # Defaults for GlobalTag -expressGlobalTag = "132X_dataRun3_Express_v4" -promptrecoGlobalTag = "132X_dataRun3_Prompt_v4" +expressGlobalTag = "140X_dataRun3_Express_v3" +promptrecoGlobalTag = "140X_dataRun3_Prompt_v4" # Mandatory for CondDBv2 globalTagConnect = "frontier://PromptProd/CMS_CONDITIONS" From 64792a5961af1988634dcafdbedc0c622a64909a Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Wed, 4 Sep 2024 14:45:04 -0500 Subject: [PATCH 03/13] Update run to use --- etc/HIReplayOfflineConfiguration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index f375d849b..bfe6a2942 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -42,7 +42,7 @@ # 356005 - 2022 pp at 13.6 TeV (1h long, 600 bunches - ALL detectors included) # 359060 - 2022 cosmics - Oberved failures in Express (https://cms-talk.web.cern.ch/t/paused-jobs-for-express-run359045-streamexpress/15232) # 361694:361699,361779 - 2022 HI dry-run test runs -setInjectRuns(tier0Config, [375820]) +setInjectRuns(tier0Config, [374951]) # Settings up sites processingSite = "T2_CH_CERN" From 11038f248bd23842a65ed565cc2c20241d4c6e9d Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Thu, 5 Sep 2024 11:22:12 -0500 Subject: [PATCH 04/13] update GTs --- etc/HIReplayOfflineConfiguration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index bfe6a2942..a1a41bcda 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -144,8 +144,8 @@ alcarawProcVersion = dt # Defaults for GlobalTag -expressGlobalTag = "140X_dataRun3_Express_v3" -promptrecoGlobalTag = "140X_dataRun3_Prompt_v4" +expressGlobalTag = "141X_dataRun3_Express_v2" +promptrecoGlobalTag = "141X_dataRun3_Prompt_v2" # Mandatory for CondDBv2 globalTagConnect = "frontier://PromptProd/CMS_CONDITIONS" From aabeab6a1bbc4224f8d077f606f6a6946bd68bbd Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Mon, 23 Sep 2024 13:45:35 -0500 Subject: [PATCH 05/13] Testing with CMSSW_14_1_0 --- etc/HIReplayOfflineConfiguration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index a1a41bcda..b9d85b4b4 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -110,7 +110,7 @@ # Defaults for CMSSW version defaultCMSSWVersion = { - 'default': "CMSSW_14_1_0_pre7" + 'default': "CMSSW_14_1_0" } # Configure ScramArch From a766e4e95061eab77242514e95fc7991eef4df20 Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Mon, 23 Sep 2024 13:57:43 -0500 Subject: [PATCH 06/13] Include scenarios in DB --- etc/HIReplayOfflineConfiguration.py | 32 +++++++++++++++++------------ src/python/T0/WMBS/Oracle/Create.py | 6 +++++- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index b9d85b4b4..fedd18d72 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -114,7 +114,8 @@ } # Configure ScramArch -setDefaultScramArch(tier0Config, "el8_amd64_gcc11") +setDefaultScramArch(tier0Config, "el8_amd64_gcc12") +setScramArch(tier0Config, "CMSSW_13_2_5", "el8_amd64_gcc11") # Configure scenarios ppScenario = "ppEra_Run3_2023" @@ -129,12 +130,16 @@ alcaPPSScenario = "AlCaPPS_Run3" #hiTestppScenario = "ppEra_Run3_pp_on_PbPb_2023" -hiTestppScenario = "Run3_2024_UPC" - #hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023" -hiRawPrimeScenario = "Run3_pp_on_PbPb_2024" -hiForwardScenario = "ppEra_Run3_2023_repacked" + +# Heavy Ion Scenarios 2024 + +hiPpRefScenario = "ppEra_Run3_2024_ppRef" +hiLightEventsScenario = "ppEra_Run3_2024_UPC" +hiHeavyEventsScenario = "Run3_pp_on_PbPb_2024" +hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023" + # Procesing version number replays # Taking Replay processing ID from the last 8 digits of the DeploymentID @@ -421,7 +426,7 @@ ##################### addExpressConfig(tier0Config, "HIExpress", - scenario=hiTestppScenario, + scenario=hiHeavyEventsScenario, diskNode="T0_CH_CERN_Disk", data_tiers=["FEVT"], write_dqm=True, @@ -475,7 +480,8 @@ versionOverride=expressVersionOverride) addExpressConfig(tier0Config, "HIExpressAlignment", - scenario=HIalcaTrackingOnlyScenario, + #scenario=HIalcaTrackingOnlyScenario, + scenario=hiHeavyEventsScenario, data_tiers=["ALCARECO", "RAW"], write_dqm=True, alca_producers=["TkAlMinBias", "PromptCalibProdBeamSpotHP"], @@ -501,7 +507,7 @@ diskNode="T0_CH_CERN_Disk") addExpressConfig(tier0Config, "HIHLTMonitor", - scenario=hiTestppScenario, + scenario=hiHeavyEventsScenario, diskNode="T2_CH_CERN", data_tiers=["FEVTHLTALL"], write_dqm=True, @@ -1425,7 +1431,7 @@ "HcalCalIsolatedBunchSelector", "HcalCalIterativePhiSym","HcalCalMinBias", "TkAlJpsiMuMu", "TkAlUpsilonMuMu","TkAlZMuMu","TkAlMuonIsolated"], dqm_sequences=["@commonSiStripZeroBias", "@ecal", "@hcal", "@muon", "@jetmet", "@egamma"], - scenario=hiForwardScenario) + scenario=hiLightEventsScenario) DATASETS = ["HIMinimumBias0", "HIMinimumBias1", "HIMinimumBias2", "HIMinimumBias3", "HIMinimumBias4", "HIMinimumBias5", "HIMinimumBias6", "HIMinimumBias7", @@ -1440,7 +1446,7 @@ write_dqm=True, alca_producers=["SiStripCalZeroBias", "SiStripCalMinBias", "TkAlMinBias"], dqm_sequences=["@commonSiStripZeroBias"], - scenario=hiTestppScenario) + scenario=hiLightEventsScenario) DATASETS = ["HIEphemeralHLTPhysics"] @@ -1451,7 +1457,7 @@ write_dqm=True, disk_node="T2_US_Vanderbilt", dqm_sequences=["@commonSiStripZeroBias"], - scenario=hiTestppScenario) + scenario=hiLightEventsScenario) DATASETS = ["HIEphemeralZeroBias0", "HIEphemeralZeroBias1"] @@ -1463,7 +1469,7 @@ timePerEvent=1, disk_node="T2_US_Vanderbilt", dqm_sequences=["@commonSiStripZeroBias"], - scenario=hiTestppScenario) + scenario=hiLightEventsScenario) DATASETS = ["HITestRawPrime0", "HITestRawPrime1", "HITestRawPrime2", "HITestRawPrime3", "HITestRawPrime4", "HITestRawPrime5", "HITestRawPrime6", "HITestRawPrime7", "HITestRawPrime8", "HITestRawPrime9", @@ -1527,7 +1533,7 @@ dqm_sequences=["@commonSiStripZeroBias", "@ecal", "@hcal", "@muon", "@jetmet", "@egamma"], alca_producers=["SiStripCalZeroBias", "TkAlMinBias", "SiStripCalMinBias"], timePerEvent=1, - scenario=hiForwardScenario) + scenario=hiLightEventsScenario) ####################### ### ignored streams ### diff --git a/src/python/T0/WMBS/Oracle/Create.py b/src/python/T0/WMBS/Oracle/Create.py index c87dd063e..b3bd2388c 100644 --- a/src/python/T0/WMBS/Oracle/Create.py +++ b/src/python/T0/WMBS/Oracle/Create.py @@ -941,7 +941,11 @@ 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 : "ppEra_Run3_2024_UPC", + 53 : "ppEra_Run3_pp_on_PbPb_2024", + 54 : "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024", + 55 : "ppEra_Run3_2024_ppRef" } for id, name in list(eventScenarios.items()): sql = """INSERT INTO event_scenario From 2cd2da3db92433e81940adeeb8679cb96aed0d52 Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Tue, 1 Oct 2024 13:43:48 -0500 Subject: [PATCH 07/13] Update GTs to v3 --- etc/HIReplayOfflineConfiguration.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index fedd18d72..afb40739e 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -137,7 +137,7 @@ hiPpRefScenario = "ppEra_Run3_2024_ppRef" hiLightEventsScenario = "ppEra_Run3_2024_UPC" -hiHeavyEventsScenario = "Run3_pp_on_PbPb_2024" +hiHeavyEventsScenario = "ppEra_Run3_pp_on_PbPb_2024" hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023" @@ -149,8 +149,8 @@ alcarawProcVersion = dt # Defaults for GlobalTag -expressGlobalTag = "141X_dataRun3_Express_v2" -promptrecoGlobalTag = "141X_dataRun3_Prompt_v2" +expressGlobalTag = "141X_dataRun3_Express_v3" +promptrecoGlobalTag = "141X_dataRun3_Prompt_v3" # Mandatory for CondDBv2 globalTagConnect = "frontier://PromptProd/CMS_CONDITIONS" @@ -1373,7 +1373,7 @@ write_dqm=True, alca_producers=["TkAlMinBias"], dqm_sequences=["@common"], - scenario=hiTestppScenario) + scenario=hiLightEventsScenario) DATASETS = ["HIOnlineMonitor", "HITrackerNZS"] @@ -1382,7 +1382,7 @@ do_reco=False, aod_to_disk=False, raw_to_disk=False, - scenario=hiTestppScenario) + scenario=hiLightEventsScenario) DATASETS = ["HIEmptyBX"] @@ -1393,7 +1393,7 @@ raw_to_disk=False, aod_to_disk=False, dqm_sequences=["@common"], - scenario=hiTestppScenario) + scenario=hiLightEventsScenario) DATASETS = ["HITestRaw0", "HITestRaw1", "HITestRaw2", "HITestRaw3", "HITestRaw4", "HITestRaw5", "HITestRaw6", "HITestRaw7", "HITestRaw8", "HITestRaw9", "HITestRaw10", "HITestRaw11", @@ -1410,7 +1410,7 @@ "HcalCalIsolatedBunchSelector", "HcalCalIterativePhiSym","HcalCalMinBias", "TkAlJpsiMuMu", "TkAlUpsilonMuMu","TkAlZMuMu","TkAlMuonIsolated"], dqm_sequences=["@commonSiStripZeroBias", "@ecal", "@hcal", "@muon", "@jetmet"], - scenario=hiTestppScenario) + scenario=hiLightEventsScenario) DATASETS = ["HIForward0", "HIForward1", "HIForward2", "HIForward3", "HIForward4", "HIForward5", "HIForward6", "HIForward7", "HIForward8", From b48d2ed7c3eedad40fe897674c9b4c804022ca01 Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Wed, 2 Oct 2024 15:32:31 -0500 Subject: [PATCH 08/13] Settle scenarios to proper PDs --- etc/HIReplayOfflineConfiguration.py | 30 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index afb40739e..c8aaf09f3 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -136,9 +136,9 @@ # Heavy Ion Scenarios 2024 hiPpRefScenario = "ppEra_Run3_2024_ppRef" -hiLightEventsScenario = "ppEra_Run3_2024_UPC" -hiHeavyEventsScenario = "ppEra_Run3_pp_on_PbPb_2024" -hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023" +hiForwardScenario = "ppEra_Run3_2024_UPC" +hiScenario = "ppEra_Run3_pp_on_PbPb_2024" +hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024" # Procesing version number replays @@ -426,7 +426,7 @@ ##################### addExpressConfig(tier0Config, "HIExpress", - scenario=hiHeavyEventsScenario, + scenario=hiScenario, diskNode="T0_CH_CERN_Disk", data_tiers=["FEVT"], write_dqm=True, @@ -481,7 +481,7 @@ addExpressConfig(tier0Config, "HIExpressAlignment", #scenario=HIalcaTrackingOnlyScenario, - scenario=hiHeavyEventsScenario, + scenario=hiScenario, data_tiers=["ALCARECO", "RAW"], write_dqm=True, alca_producers=["TkAlMinBias", "PromptCalibProdBeamSpotHP"], @@ -507,7 +507,7 @@ diskNode="T0_CH_CERN_Disk") addExpressConfig(tier0Config, "HIHLTMonitor", - scenario=hiHeavyEventsScenario, + scenario=hiScenario, diskNode="T2_CH_CERN", data_tiers=["FEVTHLTALL"], write_dqm=True, @@ -1373,7 +1373,7 @@ write_dqm=True, alca_producers=["TkAlMinBias"], dqm_sequences=["@common"], - scenario=hiLightEventsScenario) + scenario=hiScenario) DATASETS = ["HIOnlineMonitor", "HITrackerNZS"] @@ -1382,7 +1382,7 @@ do_reco=False, aod_to_disk=False, raw_to_disk=False, - scenario=hiLightEventsScenario) + scenario=hiScenario) DATASETS = ["HIEmptyBX"] @@ -1393,7 +1393,7 @@ raw_to_disk=False, aod_to_disk=False, dqm_sequences=["@common"], - scenario=hiLightEventsScenario) + scenario=hiScenario) DATASETS = ["HITestRaw0", "HITestRaw1", "HITestRaw2", "HITestRaw3", "HITestRaw4", "HITestRaw5", "HITestRaw6", "HITestRaw7", "HITestRaw8", "HITestRaw9", "HITestRaw10", "HITestRaw11", @@ -1410,7 +1410,7 @@ "HcalCalIsolatedBunchSelector", "HcalCalIterativePhiSym","HcalCalMinBias", "TkAlJpsiMuMu", "TkAlUpsilonMuMu","TkAlZMuMu","TkAlMuonIsolated"], dqm_sequences=["@commonSiStripZeroBias", "@ecal", "@hcal", "@muon", "@jetmet"], - scenario=hiLightEventsScenario) + scenario=hiScenario) DATASETS = ["HIForward0", "HIForward1", "HIForward2", "HIForward3", "HIForward4", "HIForward5", "HIForward6", "HIForward7", "HIForward8", @@ -1431,7 +1431,7 @@ "HcalCalIsolatedBunchSelector", "HcalCalIterativePhiSym","HcalCalMinBias", "TkAlJpsiMuMu", "TkAlUpsilonMuMu","TkAlZMuMu","TkAlMuonIsolated"], dqm_sequences=["@commonSiStripZeroBias", "@ecal", "@hcal", "@muon", "@jetmet", "@egamma"], - scenario=hiLightEventsScenario) + scenario=hiForwardScenario) DATASETS = ["HIMinimumBias0", "HIMinimumBias1", "HIMinimumBias2", "HIMinimumBias3", "HIMinimumBias4", "HIMinimumBias5", "HIMinimumBias6", "HIMinimumBias7", @@ -1446,7 +1446,7 @@ write_dqm=True, alca_producers=["SiStripCalZeroBias", "SiStripCalMinBias", "TkAlMinBias"], dqm_sequences=["@commonSiStripZeroBias"], - scenario=hiLightEventsScenario) + scenario=hiScenario) DATASETS = ["HIEphemeralHLTPhysics"] @@ -1457,7 +1457,7 @@ write_dqm=True, disk_node="T2_US_Vanderbilt", dqm_sequences=["@commonSiStripZeroBias"], - scenario=hiLightEventsScenario) + scenario=hiScenario) DATASETS = ["HIEphemeralZeroBias0", "HIEphemeralZeroBias1"] @@ -1469,7 +1469,7 @@ timePerEvent=1, disk_node="T2_US_Vanderbilt", dqm_sequences=["@commonSiStripZeroBias"], - scenario=hiLightEventsScenario) + scenario=hiScenario) DATASETS = ["HITestRawPrime0", "HITestRawPrime1", "HITestRawPrime2", "HITestRawPrime3", "HITestRawPrime4", "HITestRawPrime5", "HITestRawPrime6", "HITestRawPrime7", "HITestRawPrime8", "HITestRawPrime9", @@ -1533,7 +1533,7 @@ dqm_sequences=["@commonSiStripZeroBias", "@ecal", "@hcal", "@muon", "@jetmet", "@egamma"], alca_producers=["SiStripCalZeroBias", "TkAlMinBias", "SiStripCalMinBias"], timePerEvent=1, - scenario=hiLightEventsScenario) + scenario=hiScenario) ####################### ### ignored streams ### From 58312e198751dd89c310e04418ddf3aabdc71b8f Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Tue, 8 Oct 2024 10:40:38 -0500 Subject: [PATCH 09/13] Using CMSSW_14_1_1 --- etc/HIReplayOfflineConfiguration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index c8aaf09f3..db2649226 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -110,7 +110,7 @@ # Defaults for CMSSW version defaultCMSSWVersion = { - 'default': "CMSSW_14_1_0" + 'default': "CMSSW_14_1_1" } # Configure ScramArch From c33bff112f3e75427d19e2cb437beb11586eee20 Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Fri, 11 Oct 2024 10:34:13 -0500 Subject: [PATCH 10/13] Now testing with CMSSW_14_1_2 --- etc/HIReplayOfflineConfiguration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index e23db8bc3..d690c31c1 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -115,7 +115,7 @@ # Defaults for CMSSW version defaultCMSSWVersion = { - 'default': "CMSSW_14_1_1" + 'default': "CMSSW_14_1_2" } # Configure ScramArch From d29649602d1f03bf28d4db466e80b3e887d0e243 Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Thu, 17 Oct 2024 12:29:08 -0500 Subject: [PATCH 11/13] Testing CMSSW_14_1_3 --- etc/HIReplayOfflineConfiguration.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index d690c31c1..892dc3a15 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -43,7 +43,7 @@ # 356005 - 2022 pp at 13.6 TeV (1h long, 600 bunches - ALL detectors included) # 359060 - 2022 cosmics - Oberved failures in Express (https://cms-talk.web.cern.ch/t/paused-jobs-for-express-run359045-streamexpress/15232) # 361694:361699,361779 - 2022 HI dry-run test runs -setInjectRuns(tier0Config, [374951]) +setInjectRuns(tier0Config, [374951, 375549]) # Define streams to ignore. These wont be injected by the MainAgent setHelperAgentStreams(tier0Config, {'SecondAgent': [], @@ -115,15 +115,16 @@ # Defaults for CMSSW version defaultCMSSWVersion = { - 'default': "CMSSW_14_1_2" + 'default': "CMSSW_14_1_3" } # Configure ScramArch setDefaultScramArch(tier0Config, "el8_amd64_gcc12") setScramArch(tier0Config, "CMSSW_13_2_5", "el8_amd64_gcc11") +setScramArch(tier0Config, "CMSSW_13_2_6", "el8_amd64_gcc11") # Configure scenarios -ppScenario = "ppEra_Run3_2023" +ppScenario = "ppEra_Run3" cosmicsScenario = "cosmicsEra_Run3" hcalnzsScenario = "hcalnzsEra_Run3" HIhcalnzsScenario = "hcalnzsEra_Run3_pp_on_PbPb" @@ -485,8 +486,7 @@ versionOverride=expressVersionOverride) addExpressConfig(tier0Config, "HIExpressAlignment", - #scenario=HIalcaTrackingOnlyScenario, - scenario=hiScenario, + scenario=HIalcaTrackingOnlyScenario, data_tiers=["ALCARECO", "RAW"], write_dqm=True, alca_producers=["TkAlMinBias", "PromptCalibProdBeamSpotHP"], From ab4518dbdc764abf19215cf2b6d49aea349610f3 Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Wed, 23 Oct 2024 20:52:07 -0500 Subject: [PATCH 12/13] helper agent streams relocation --- etc/HIProdOfflineConfiguration.py | 10 +++++----- etc/HIReplayOfflineConfiguration.py | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/etc/HIProdOfflineConfiguration.py b/etc/HIProdOfflineConfiguration.py index a280bcaac..eb1f08317 100644 --- a/etc/HIProdOfflineConfiguration.py +++ b/etc/HIProdOfflineConfiguration.py @@ -38,11 +38,6 @@ # Set the max run number: setInjectMaxRun(tier0Config, 9999999) - -# Define streams to ignore. These wont be injected by the MainAgent -setHelperAgentStreams(tier0Config, {'SecondAgent': [], - 'ThirdAgent' : [] - }) # Settings up sites processingSite = "T2_CH_CERN" @@ -1674,6 +1669,11 @@ timePerEvent=1, scenario=hiForwardScenario) +# Define streams to ignore. These wont be injected by the MainAgent +setHelperAgentStreams(tier0Config, {'SecondAgent': [], + 'ThirdAgent' : [] + }) + ####################### ### ignored streams ### ####################### diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index 892dc3a15..2e0deb499 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -45,10 +45,6 @@ # 361694:361699,361779 - 2022 HI dry-run test runs setInjectRuns(tier0Config, [374951, 375549]) -# Define streams to ignore. These wont be injected by the MainAgent -setHelperAgentStreams(tier0Config, {'SecondAgent': [], - 'ThirdAgent' : [] - }) # Settings up sites processingSite = "T2_CH_CERN" storageSite = "T0_CH_CERN_Disk" @@ -1540,6 +1536,11 @@ timePerEvent=1, scenario=hiScenario) +# Define streams to ignore. These wont be injected by the MainAgent +setHelperAgentStreams(tier0Config, {'SecondAgent': [], + 'ThirdAgent' : [] + }) + ####################### ### ignored streams ### ####################### From 4015754f93efc9acb58b873906e517dc0ef8e0ee Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Wed, 23 Oct 2024 21:07:25 -0500 Subject: [PATCH 13/13] Adding changes to the HIProduction config file --- etc/HIProdOfflineConfiguration.py | 47 +++++++++++++++-------------- etc/HIReplayOfflineConfiguration.py | 6 +--- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/etc/HIProdOfflineConfiguration.py b/etc/HIProdOfflineConfiguration.py index eb1f08317..124beaa42 100644 --- a/etc/HIProdOfflineConfiguration.py +++ b/etc/HIProdOfflineConfiguration.py @@ -56,7 +56,7 @@ # Data type # Processing site (where jobs run) # PhEDEx locations -setAcquisitionEra(tier0Config, "HIRun2023A") +setAcquisitionEra(tier0Config, "HIRun2024A") setBaseRequestPriority(tier0Config, 251000) setBackfill(tier0Config, None) setBulkDataType(tier0Config, "hidata") @@ -102,36 +102,39 @@ setDefaultScramArch(tier0Config, "el8_amd64_gcc11") # Configure scenarios -ppScenario = "ppEra_Run3_2023" +ppScenario = "ppEra_Run3" cosmicsScenario = "cosmicsEra_Run3" hcalnzsScenario = "hcalnzsEra_Run3" HIhcalnzsScenario = "hcalnzsEra_Run3_pp_on_PbPb" -hiScenario = "ppEra_Run3_pp_on_PbPb_2023" alcaTrackingOnlyScenario = "trackingOnlyEra_Run3" HIalcaTrackingOnlyScenario = "trackingOnlyEra_Run3_pp_on_PbPb" alcaTestEnableScenario = "AlCaTestEnable" alcaLumiPixelsScenario = "AlCaLumiPixels_Run3" alcaPPSScenario = "AlCaPPS_Run3" -hiTestppScenario = "ppEra_Run3_pp_on_PbPb_2023" -hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023" -hiForwardScenario = "ppEra_Run3_2023_repacked" +ppRefScenario = "ppEra_Run3_2024_ppRef" + +# Heavy Ion Scenarios 2024 + +hiForwardScenario = "ppEra_Run3_2024_UPC" +hiScenario = "ppEra_Run3_pp_on_PbPb_2024" +hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024" # Defaults for processing version alcarawProcVersion = { - 'default': "2", + 'default': "1", } defaultProcVersionReco = { - 'default': "2", + 'default': "1", } expressProcVersion = { - 'default': "2", + 'default': "1", } # Defaults for GlobalTag -expressGlobalTag = "132X_dataRun3_Express_v4" -promptrecoGlobalTag = "132X_dataRun3_Prompt_v4" +expressGlobalTag = "141X_dataRun3_Express_v3" +promptrecoGlobalTag = "141X_dataRun3_Prompt_v3" # Mandatory for CondDBv2 globalTagConnect = "frontier://PromptProd/CMS_CONDITIONS" @@ -390,7 +393,7 @@ ##################### addExpressConfig(tier0Config, "HIExpress", - scenario=hiTestppScenario, + scenario=hiScenario, diskNode="T2_CH_CERN", data_tiers=["FEVT"], write_dqm=True, @@ -470,7 +473,7 @@ diskNode="T2_CH_CERN") addExpressConfig(tier0Config, "HIHLTMonitor", - scenario=hiTestppScenario, + scenario=hiScenario, diskNode="T2_CH_CERN", data_tiers=["FEVTHLTALL"], write_dqm=True, @@ -1427,7 +1430,7 @@ disk_node="T2_US_Vanderbilt", alca_producers=["TkAlMinBias"], dqm_sequences=["@common"], - scenario=hiTestppScenario) + scenario=hiScenario) DATASETS = ["HIOnlineMonitor", "HITrackerNZS"] @@ -1437,7 +1440,7 @@ aod_to_disk=False, raw_to_disk=False, disk_node="T2_US_Vanderbilt", - scenario=hiTestppScenario) + scenario=hiScenario) DATASETS = ["HIEmptyBX"] @@ -1449,7 +1452,7 @@ aod_to_disk=False, disk_node="T2_US_Vanderbilt", dqm_sequences=["@common"], - scenario=hiTestppScenario) + scenario=hiScenario) DATASETS = ["HITestRaw0", "HITestRaw1", "HITestRaw2", "HITestRaw3", "HITestRaw4", "HITestRaw5", "HITestRaw6", "HITestRaw7", "HITestRaw8", "HITestRaw9", "HITestRaw10", "HITestRaw11", @@ -1467,7 +1470,7 @@ "HcalCalIsolatedBunchSelector", "HcalCalIterativePhiSym","HcalCalMinBias", "TkAlJpsiMuMu", "TkAlUpsilonMuMu","TkAlZMuMu","TkAlMuonIsolated"], dqm_sequences=["@commonSiStripZeroBias", "@ecal", "@hcal", "@muon", "@jetmet"], - scenario=hiTestppScenario) + scenario=hiScenario) DATASETS = ["HIForward0"] @@ -1524,7 +1527,7 @@ disk_node="T2_US_Vanderbilt", alca_producers=["SiStripCalZeroBias", "SiStripCalMinBias", "TkAlMinBias"], dqm_sequences=["@commonSiStripZeroBias"], - scenario=hiTestppScenario) + scenario=hiScenario) DATASETS = ["HIMinimumBias1", "HIMinimumBias2", "HIMinimumBias3", "HIMinimumBias4", "HIMinimumBias5", "HIMinimumBias6", "HIMinimumBias7", @@ -1540,7 +1543,7 @@ disk_node="T2_US_Vanderbilt", alca_producers=["SiStripCalZeroBias"], dqm_sequences=["@commonSiStripZeroBias"], - scenario=hiTestppScenario) + scenario=hiScenario) DATASETS = ["HIEphemeralHLTPhysics"] @@ -1551,7 +1554,7 @@ write_dqm=True, disk_node="T2_US_Vanderbilt", dqm_sequences=["@commonSiStripZeroBias"], - scenario=hiTestppScenario) + scenario=hiScenario) DATASETS = ["HIEphemeralZeroBias0", "HIEphemeralZeroBias1"] @@ -1563,7 +1566,7 @@ timePerEvent=1, disk_node="T2_US_Vanderbilt", dqm_sequences=["@commonSiStripZeroBias"], - scenario=hiTestppScenario) + scenario=hiScenario) DATASETS = ["HITestRawPrime0", "HITestRawPrime1", "HITestRawPrime2", "HITestRawPrime3", "HITestRawPrime4", "HITestRawPrime5", "HITestRawPrime6", "HITestRawPrime7", "HITestRawPrime8", "HITestRawPrime9", @@ -1667,7 +1670,7 @@ dqm_sequences=["@commonSiStripZeroBias", "@ecal", "@hcal", "@muon", "@jetmet", "@egamma"], alca_producers=["SiStripCalZeroBias", "TkAlMinBias", "SiStripCalMinBias"], timePerEvent=1, - scenario=hiForwardScenario) + scenario=hiScenario) # Define streams to ignore. These wont be injected by the MainAgent setHelperAgentStreams(tier0Config, {'SecondAgent': [], diff --git a/etc/HIReplayOfflineConfiguration.py b/etc/HIReplayOfflineConfiguration.py index 2e0deb499..98fbc7d3c 100644 --- a/etc/HIReplayOfflineConfiguration.py +++ b/etc/HIReplayOfflineConfiguration.py @@ -130,14 +130,10 @@ alcaTestEnableScenario = "AlCaTestEnable" alcaLumiPixelsScenario = "AlCaLumiPixels_Run3" alcaPPSScenario = "AlCaPPS_Run3" - -#hiTestppScenario = "ppEra_Run3_pp_on_PbPb_2023" -#hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2023" - +ppRefScenario = "ppEra_Run3_2024_ppRef" # Heavy Ion Scenarios 2024 -hiPpRefScenario = "ppEra_Run3_2024_ppRef" hiForwardScenario = "ppEra_Run3_2024_UPC" hiScenario = "ppEra_Run3_pp_on_PbPb_2024" hiRawPrimeScenario = "ppEra_Run3_pp_on_PbPb_approxSiStripClusters_2024"