Adding changes to the HIProduction config file

dmwm · Oct 24, 2024 · 3c832ce · 3c832ce
1 parent ab4518d
commit 3c832ce
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git a/etc/HIProdOfflineConfiguration.py b/etc/HIProdOfflineConfiguration.py
@@ -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
@@ -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"